diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-08-08 16:07:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-08-08 16:07:24 +0200 |
| commit | 5ab1098d5fbc1ba092da73af2b92e5bcdd7a3f8d (patch) | |
| tree | c4ea52b01613165a535056c00020f1b8538fcabe /solenv | |
| parent | bnc#885548: Set the date time mode to non-fixed after the import is done. (diff) | |
| download | core-5ab1098d5fbc1ba092da73af2b92e5bcdd7a3f8d.tar.gz core-5ab1098d5fbc1ba092da73af2b92e5bcdd7a3f8d.zip | |
Generalize -fsanitize=address checks
...that are at least also relevant for -fsanitize=undefined
Change-Id: I39044d2a73912a605af8e965eb1cdf8dfd4f0051
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/linux.mk | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 9801ed2c8ab1..cc355dfeba3c 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -54,7 +54,7 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_URE_LIB_FOLDER) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(subst /lo/,/lo-4.2/,$(INSTROOT))/$(LIBO_URE_LIB_FOLDER) $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(eval $(call gb_JunitTest_JunitTest_platform,$(1))) diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index 88216b6b3bfc..284e70c79f5e 100644 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -7,11 +7,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifneq ($(COM_GCC_IS_CLANG)$(filter -fsanitize=address,$(CC)),TRUE-fsanitize=address) -gb_LinkTarget_LDFLAGS += \ - -Wl,-z,defs \ - +gb__LinkTarget_LDFLAGS_zdefs := -Wl,-z,defs +ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifneq ($(filter -fsanitize=%,$(CC)),) +gb__LinkTarget_LDFLAGS_zdefs := +endif endif +gb_LinkTarget_LDFLAGS += $(gb__LinkTarget_LDFLAGS_zdefs) include $(GBUILDDIR)/platform/unxgcc.mk |