summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-02-01 21:20:57 +0100
committerMichael Stahl <mstahl@redhat.com>2017-02-01 21:21:59 +0100
commite95765027e183728cf830ee0c120df29ce04c0d3 (patch)
treec66d83aec2ecf90552430df104b6f08197bc829f
parent616e19fc25848e5b35d9a252cd20b7c16262824d (diff)
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
-rw-r--r--odk/CustomTarget_build-examples.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-examples.mk
index b9c5c534a764..ea4eb3b0381b 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), \