[Libreoffice-commits] core.git: desktop/Executable_soffice_bin.mk

[Stephan Bergmann (via logerrit)]

 desktop/Executable_soffice_bin.mk |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit f67e5ef9a5c71f3b35b1c67eb72794e44cc15410
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Feb 14 11:22:22 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Feb 14 14:04:04 2020 +0100

    Drop broken filter-out of -bind_at_load for Executable_soffice_bin on macOS
    
    We generally use -bind_at_load ("Sets a bit in the mach header of the resulting
    binary which tells dyld to bind all symbols when the binary is loaded, rather
    than lazily." according to Xcode 11.3.1 ld(1) man page) since
    4c9c1957cfc7c9de3def35dab4dcd07e76992ddd "INTEGRATION: CWS geordi2q01: #i18350#:
    join changes from CWS ooo11rc3" (lacking any explanation; later carried over
    into solenv/gbuild/platform/macosx.mk).
    
    And we filtered out -bind_at_load for Executable_soffice_bin (and others, back
    then, which have become irrelevant by now) with
    13be934b43266d3df966ce40c00316401cea7a90 "INTEGRATION: CWS geordi2q14: #111934#:
    merge CWS ooo111fix2" (again, lacking any explanation).
    
    However, the latter was effectively broken when
    6df9c479f58ea94141a3a43eb7fd6fb4d1fd5c8b "gbuildize desktop" rewrote it in
    desktop/Executable_soffice.bin.mk as
    
      $(eval $(call gb_Executable_set_ldflags,\
          $(filter-out -bind_at_load,$$(LDFLAGS)) \
      ))
    
    lacking an "soffice_bin," at the end of the first line.
    
    Given that the soffice executable is apparently built with -bind_at_load ever
    since 2011, without causing any issues, lets assume that filtering it out is no
    longer necessary (if it ever was), and drop that.
    
    (Maybe it was once necessary for some reason when the file system layout of OOo/
    LO executables and dynamic libraries was different.  But today, the soffice
    executable finds its dependent libraries, sal and sofficeapp, via
    @executable_path just fine.)
    
    Change-Id: Ifa379237cce4fa6d5ea0e2c1f1d84263f9007c50
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88680
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk
index 2a146dfd44d8..f9be897ffa1f 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -25,10 +25,6 @@ $(eval $(call gb_Executable_add_cobjects,soffice_bin,\
 
 ifeq ($(OS),MACOSX)
 
-$(eval $(call gb_Executable_set_ldflags,\
-    $(filter-out -bind_at_load,$$(LDFLAGS)) \
-))
-
 # At least when building against SDK 10.15, changing the LC_VERSION_MIN_MACOSX load command's sdk
 # value from 10.15 to "n/a" (i.e., 0.0) is necessary to avoid blurry text in the LO UI:
 $(eval $(call gb_Executable_add_ldflags,soffice_bin, \