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

[Michael Stahl]

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

New commits:
commit e95765027e183728cf830ee0c120df29ce04c0d3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Feb 1 21:20:57 2017 +0100

    odk: don't run make with LD_LIBRARY_PATH set
    
    In a build with -fsanitize=address, this fails with:
    
    Change-Id: If8581363a395af78bbbe00dd656290aea53af330
    make: symbol lookup error: instdir/program/libfreebl3.so: undefined symbol: __asan_option_detect_stack_use_after_return

diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk
index b9c5c53..ea4eb3b 100644
--- a/odk/CustomTarget_build-examples.mk
+++ b/odk/CustomTarget_build-examples.mk
@@ -91,6 +91,7 @@ $(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 \
         && export \
             UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,odk/build-examples)/user) \
         $(foreach my_dir,$(my_example_dirs), \
commit 616e19fc25848e5b35d9a252cd20b7c16262824d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Feb 1 21:14:02 2017 +0100

    odk: recreate setsdkenv if config changes
    
    Change-Id: I4a34f03fdab4626bdbf9b254986b0953ecfdffa7

diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk
index 27f0158..b9c5c53 100644
--- a/odk/CustomTarget_build-examples.mk
+++ b/odk/CustomTarget_build-examples.mk
@@ -102,7 +102,8 @@ $(call gb_CustomTarget_get_target,odk/build-examples): \
             && exit $$RET)
 
 $(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv: \
-        $(SRCDIR)/odk/config/setsdkenv_unix.sh.in | \
+        $(SRCDIR)/odk/config/setsdkenv_unix.sh.in \
+		$(BUILDDIR)/config_$(gb_Side).mk | \
         $(call gb_CustomTarget_get_workdir,odk/build-examples)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
 	sed -e 's!@OO_SDK_NAME@!sdk!' \