[Libreoffice-commits] core.git: odk/CustomTarget_build-examples.mk

[Stephan Bergmann]

 odk/CustomTarget_build-examples.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d8546e9781df89249c218fb596bbe95b8a6c7469
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 7 08:59:23 2017 +0100

    ...but on macOS we do need the SDK-augmented DYLD_LIBRARY_PATH
    
    ...because the executables in SDK's bin/ dir find LO's URE libs that way
    
    Change-Id: I7fe88638760afc24d639c6162656ee40c05e6814

diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk
index 1083c6e..69434e6 100644
--- a/odk/CustomTarget_build-examples.mk
+++ b/odk/CustomTarget_build-examples.mk
@@ -91,7 +91,8 @@ $(call gb_CustomTarget_get_target,odk/build-examples): \
         $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
 	(saved_library_path=$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $< \
-		&& $(gb_Helper_LIBRARY_PATH_VAR)=$$saved_library_path \
+		$(if $(filter MACOSX,$(OS)),, \
+            && $(gb_Helper_LIBRARY_PATH_VAR)=$$saved_library_path) \
         && export \
             UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,odk/build-examples)/user) \
         $(foreach my_dir,$(my_example_dirs), \