diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | coreconf/Darwin.mk | 2 | ||||
| -rw-r--r-- | coreconf/sanitizers.mk | 4 | ||||
| -rw-r--r-- | tests/common/init.sh | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -92,7 +92,7 @@ NSPR_CONFIGURE_OPTS += --enable-debug-symbols endif NSPR_CONFIGURE_ENV += CFLAGS='$(SANITIZER_CFLAGS)' \ CXXFLAGS='$(SANITIZER_CFLAGS)' \ - LDFLAGS='$(SANITIZER_LFLAGS)' + LDFLAGS='$(SANITIZER_LDFLAGS)' endif # diff --git a/coreconf/Darwin.mk b/coreconf/Darwin.mk index 0e20369b9..85b05cece 100644 --- a/coreconf/Darwin.mk +++ b/coreconf/Darwin.mk @@ -138,4 +138,4 @@ ifeq (3,$(SYS_SQLITE3_VERSION_MAJOR)) endif include $(CORE_DEPTH)/coreconf/sanitizers.mk -DARWIN_SDK_SHLIBFLAGS += $(SANITIZER_FLAGS) +DARWIN_SDK_SHLIBFLAGS += $(SANITIZER_LDFLAGS) diff --git a/coreconf/sanitizers.mk b/coreconf/sanitizers.mk index 17fe46707..92937cfb3 100644 --- a/coreconf/sanitizers.mk +++ b/coreconf/sanitizers.mk @@ -4,9 +4,9 @@ ifeq ($(USE_ASAN), 1) SANITIZER_FLAGS_COMMON = -fsanitize=address $(EXTRA_SANITIZER_FLAGS) SANITIZER_CFLAGS = $(SANITIZER_FLAGS_COMMON) -SANITIZER_LFLAGS = $(SANITIZER_FLAGS_COMMON) +SANITIZER_LDFLAGS = $(SANITIZER_FLAGS_COMMON) OS_CFLAGS += $(SANITIZER_CFLAGS) -LDFLAGS += $(SANITIZER_LFLAGS) +LDFLAGS += $(SANITIZER_LDFLAGS) # ASan needs frame pointers to save stack traces for allocation/free sites. # (Warning: some platforms, like ARM Linux in Thumb mode, don't have useful diff --git a/tests/common/init.sh b/tests/common/init.sh index af573e87e..81eae36c0 100644 --- a/tests/common/init.sh +++ b/tests/common/init.sh @@ -45,7 +45,7 @@ NSS_STRICT_SHUTDOWN=1 export NSS_STRICT_SHUTDOWN # If using ASan, disable LSan; see bug 1246801. -ASAN_OPTIONS="detect_leaks=0${ASAN_OPTIONS:+,$ASAN_OPTIONS}" +ASAN_OPTIONS="detect_leaks=0${ASAN_OPTIONS:+:$ASAN_OPTIONS}" export ASAN_OPTIONS # Init directories based on HOSTDIR variable |