odk/CustomTarget_build-examples.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 813b9d4eae326b6ffdd6922461d7e1ffcf8f309b Author: Stephan Bergmann <[email protected]> Date: Sun Feb 5 10:38:58 2017 +0100 Fix LD_LIBRARY_PATH resetting I /think/ a set-but-null LD_LIBRARY_PATH (Linux), DYLD_LIBRARY_PATH (macOS) are each treated like an unset one. Change-Id: If60698d6f21a16456dac9c3d4f4e1aa3561e1a65 diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk index ea4eb3b..1083c6e 100644 --- a/odk/CustomTarget_build-examples.mk +++ b/odk/CustomTarget_build-examples.mk @@ -90,8 +90,8 @@ endif $(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) - (. $< \ - && unset LD_LIBRARY_PATH \ + (saved_library_path=$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $< \ + && $(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), \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
