[openoffice] branch trunk updated: More s5abi->gcc3 fluff... Whatta pain. Should have kept it s5abi :-P

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new b324a13  More s5abi->gcc3 fluff... Whatta pain. Should have kept it s5abi :-P
b324a13 is described below

commit b324a13c356e00ab9de3cc5bba7e1d635c6c3b44
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Fri Dec 18 14:39:08 2020 -0500

    More s5abi->gcc3 fluff... Whatta pain. Should have kept it s5abi :-P
    
    (cherry picked from commit 6958bde220413b1c2b08f8600a28e5ef5adae22c)
---
 main/cppuhelper/Library_cppuhelper.mk | 4 +---
 main/formula/util/makefile.pmk        | 2 +-
 main/solenv/inc/target.mk             | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/main/cppuhelper/Library_cppuhelper.mk b/main/cppuhelper/Library_cppuhelper.mk
index 2397375..0e71bf9 100644
--- a/main/cppuhelper/Library_cppuhelper.mk
+++ b/main/cppuhelper/Library_cppuhelper.mk
@@ -33,11 +33,9 @@ else ifeq ($(COMNAME),sunpro5)
 $(eval $(call gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/cc5_solaris_sparc.map))
 else ifeq ($(GUI)$(COMNAME),OS2gcc3)
 $(eval $(call gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/gcc3os2.map))
-else
-ifneq ($(OS),MACOSX)
+else ifneq ($(OS),MACOSX)
 $(eval $(call gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/gcc3.map))
 endif
-endif
 
 
 $(eval $(call gb_Library_set_include,cppuhelper,\
diff --git a/main/formula/util/makefile.pmk b/main/formula/util/makefile.pmk
index ce280ef..8c72c53 100644
--- a/main/formula/util/makefile.pmk
+++ b/main/formula/util/makefile.pmk
@@ -25,7 +25,7 @@
 CDEFS += -DFORMULA_DLLIMPLEMENTATION
 
 # set default symbol visibility / scope to hidden
-.IF "$(COMNAME)" == "gcc3"
+.IF "$(COMNAME)" == "gcc3" && "$(OS)"!="MACOSX"
 .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 CFLAGS += -fvisibility=hidden
 .ENDIF # HAVE_GCC_VISIBILITY_FEATURE
diff --git a/main/solenv/inc/target.mk b/main/solenv/inc/target.mk
index eb7c5f7..07a79dc 100644
--- a/main/solenv/inc/target.mk
+++ b/main/solenv/inc/target.mk
@@ -35,7 +35,7 @@ target_empty=warn_target_empty
 CDEFS+=-DSTL_OS2_BUILDING
 .ENDIF
 .IF "$(VISIBILITY_HIDDEN)" != ""
-.IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+.IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" && "$(OS)"!="MACOSX"
 .IF "$(GUI)" != "OS2"
 CFLAGS += -fvisibility=hidden
 .ENDIF