[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cpputools/Executable_regsingleton.mk cpputools/Executable_sp2bv.mk solenv/inc

[Libreoffice Gerrit user]

 cpputools/Executable_regsingleton.mk |    6 ++++++
 cpputools/Executable_sp2bv.mk        |    5 +++++
 solenv/inc/unxmacc.mk                |    2 +-
 solenv/inc/unxmacx.mk                |    2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit f454c3c33c87ed1e754ba5b5cdde1b72cfb56ac5
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Mon Jan 14 21:24:02 2019 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Mon Jan 14 21:24:02 2019 +0000

    Force -dynamiclib with -install_name and allow for max pathlen, just in case

diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk
index 747a01a94ea5..364897c54aac 100644
--- a/cpputools/Executable_regsingleton.mk
+++ b/cpputools/Executable_regsingleton.mk
@@ -31,6 +31,12 @@ $(eval $(call gb_Executable_add_linked_libs,regsingleton,\
     $(gb_STDLIBS) \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Executable_add_ldflags,regsingleton,\
+	-dynamiclib -headerpad_max_install_names \
+))
+endif
+
 $(eval $(call gb_Executable_set_private_extract_of_public_api,regsingleton,$(OUTDIR)/bin/udkapi.rdb,\
  	com.sun.star.uno.TypeClass \
  	com.sun.star.uno.XAggregation \
diff --git a/cpputools/Executable_sp2bv.mk b/cpputools/Executable_sp2bv.mk
index 17f4294ce336..4fa1ad524bbd 100644
--- a/cpputools/Executable_sp2bv.mk
+++ b/cpputools/Executable_sp2bv.mk
@@ -29,6 +29,11 @@ $(eval $(call gb_Executable_add_linked_libs,sp2bv,\
     $(gb_STDLIBS) \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Executable_add_ldflags,sp2bv,\
+	-dynamiclib -headerpad_max_install_names \
+))
+endif
 $(eval $(call gb_Executable_add_exception_objects,sp2bv,\
 	cpputools/source/sp2bv/sp2bv \
 ))
diff --git a/solenv/inc/unxmacc.mk b/solenv/inc/unxmacc.mk
index 8150c5c0819e..4e9cca9ccef8 100644
--- a/solenv/inc/unxmacc.mk
+++ b/solenv/inc/unxmacc.mk
@@ -167,7 +167,7 @@ LINK*=$(CXX)
 LINKC*=$(CC)
 
 ###LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
-EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH) -Wl,-headerpad,ff
+EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH) -Wl,-headerpad_max_install_names
 LINKFLAGSRUNPATH_URELIB=-install_name '@_______URELIB/$(@:f)'
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=-install_name '@_______OOO/$(@:f)'
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index ec23c4349405..dc19e67dc7a8 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -186,7 +186,7 @@ LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc.a
 LINK*=$(CXX)
 LINKC*=$(CC)
 
-LINKFLAGSDEFS*=-Wl,-headerpad,ff,-multiply_defined,suppress
+LINKFLAGSDEFS*=-Wl,-headerpad_max_install_names,-multiply_defined,suppress
 # assure backwards-compatibility
 EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
 LINKFLAGSRUNPATH_URELIB=-install_name '@_______URELIB/$(@:f)'