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
commit 5bc7609c54ea566eaad586b782ce0f06331b5b71 Author: Jim Jagielski <[email protected]> AuthorDate: Sun Dec 20 08:36:27 2020 -0500 Revert "More s5abi->gcc3 fluff... Whatta pain. Should have kept it s5abi :-P" This reverts commit b324a13c356e00ab9de3cc5bba7e1d635c6c3b44. --- main/cppuhelper/Library_cppuhelper.mk | 4 +++- main/formula/util/makefile.pmk | 2 +- main/solenv/inc/target.mk | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/main/cppuhelper/Library_cppuhelper.mk b/main/cppuhelper/Library_cppuhelper.mk index 0e71bf9..2397375 100644 --- a/main/cppuhelper/Library_cppuhelper.mk +++ b/main/cppuhelper/Library_cppuhelper.mk @@ -33,9 +33,11 @@ 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 8c72c53..ce280ef 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" && "$(OS)"!="MACOSX" +.IF "$(COMNAME)" == "gcc3" .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 07a79dc..eb7c5f7 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" && "$(OS)"!="MACOSX" +.IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" .IF "$(GUI)" != "OS2" CFLAGS += -fvisibility=hidden .ENDIF
