Bug 1233568: Fix a few issues noticed after this landed. r=wtc.

Specifically:
* Use correct delimiter in ASAN_OPTIONS.
* Variable name change (LDFLAGS vs. LFLAGS).
* Unbreak Mac ASan build -- shlib linker flags were wrong.

Makefile

@@ -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
 
 #

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)

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

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