Bug 1083572 - Apply some make black magic to make the fix actually work
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 31 Oct 2014 18:09:06 -0400
changeset 213460 883b62c5b1e1f001cd779156dc927e36c4d3880e
parent 213459 2026699132a1ec3c2b44fd0769f515eaa2044dbb
child 213461 89282ba7eec983259684c65eebf3a9d4b7d2f525
push id51233
push usereakhgari@mozilla.com
push dateFri, 31 Oct 2014 22:09:12 +0000
treeherdermozilla-inbound@883b62c5b1e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1083572
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1083572 - Apply some make black magic to make the fix actually work
config/external/nss/Makefile.in
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -239,17 +239,18 @@ endif
 ifdef MOZ_NO_WLZDEFS
 DEFAULT_GMAKE_FLAGS += ZDEFS_FLAG=
 endif
 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)'
+XLDFLAGS := $(OS_LDFLAGS)
+DEFAULT_GMAKE_FLAGS += XLDFLAGS='$(XLDFLAGS)'
 endif
 
 DEFAULT_GMAKE_FLAGS += NSS_NO_PKCS11_BYPASS=1
 
 # Put NSS headers directly under $(DIST)/include
 DEFAULT_GMAKE_FLAGS += PUBLIC_EXPORT_DIR='$(ABS_DIST)/include/$$(MODULE)'
 DEFAULT_GMAKE_FLAGS += SOURCE_XPHEADERS_DIR='$$(SOURCE_XP_DIR)/include/$$(MODULE)'
 DEFAULT_GMAKE_FLAGS += MODULE_INCLUDES='$$(addprefix -I$$(SOURCE_XP_DIR)/include/,$$(REQUIRES))'