Comment on attachment 8505864 [details] [diff] [review] Enable passing external LDFLAGS to the NSS build system for Windows ASAN builds Review of attachment 8505864 [details] [diff] [review]: ----------------------------------------------------------------- ::: configure.in @@ +936,5 @@ > > AC_PATH_XTRA > > XCFLAGS="$X_CFLAGS" > +EXTERNAL_LDFLAGS="$LDFLAGS" What is the difference in value between OS_LDFLAGS and EXTERNAL_LDFLAGS in objdir/config/autoconf.mk?

Actually, it turns out that I was right originally: $ cd objdir/config/external/nss $ mozmake echo-variable-OS_LDFLAGS clang_rt.asan_dynamic-i386.lib clang_rt.asan_dynamic_runtime_thunk-i386.lib -DYNAMICBASE -DEBUG -DEBUGTYPE:CV -DEF:nss3.def So, OS_LDFLAGS is unsuitable here. glandium, should I go back to using EXTERNAL_LDFLAGS?

Try this: diff --git a/config/external/nss/Makefile.in b/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))'

Wow, that works! Pushed as: https://hg.mozilla.org/integration/mozilla-inbound/rev/883b62c5b1e1