From e2e6d53153b2f21ed549b3ca3900c1875871752c Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Fri, 31 Oct 2014 18:09:06 -0400 Subject: [PATCH] Bug 1083572 - Apply some make black magic to make the fix actually work --- config/external/nss/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 020ce807996f..63944de09d15 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -244,7 +244,8 @@ 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