Bug 1083572 - Enable passing external LDFLAGS to the NSS build system…

… for Windows ASAN builds; r=glandium
dothq · Oct 22, 2014 · fd208ef · fd208ef
1 parent b126e6f
commit fd208ef
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in
@@ -240,6 +240,9 @@ ifdef MOZ_CFLAGS_NSS
 DEFAULT_GMAKE_FLAGS += XCFLAGS='$(CFLAGS)'
 DEFAULT_GMAKE_FLAGS += DARWIN_DYLIB_VERSIONS='-compatibility_version 1 -current_version 1 $(LDFLAGS)'
 endif
+ifeq (1_1,$(CLANG_CL)_$(MOZ_ASAN))
+DEFAULT_GMAKE_FLAGS += XLDFLAGS='$(OS_LDFLAGS)'
+endif
 
 DEFAULT_GMAKE_FLAGS += NSS_NO_PKCS11_BYPASS=1