Bustage fix from bug 415928, r=ted
authorgavin@gavinsharp.com
Tue, 26 Feb 2008 10:30:21 -0800
changeset 12271 dcee308be5884987bf653b2d38b45cc2962d0be6
parent 12270 d6350d079c6ab014fb39d36cea1ea2fd54e6725d
child 12272 0945f5ce00e6d56f8eafe2c226cc5fef5d05ded4
push idunknown
push userunknown
push dateunknown
reviewersted
bugs415928
milestone1.9b4pre
Bustage fix from bug 415928, r=ted
config/autoconf.mk.in
security/manager/Makefile.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -566,19 +566,19 @@ MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
 WIN32_REDIST_DIR = @WIN32_REDIST_DIR@
 WIN32_CRT_SRC_DIR = @WIN32_CRT_SRC_DIR@
 WIN32_CUSTOM_CRT_DIR = @WIN32_CUSTOM_CRT_DIR@
 # These are for custom CRT building
 ifdef MOZ_MEMORY
 ifneq (,$(WIN32_CRT_SRC_DIR)$(WIN32_CUSTOM_CRT_DIR))
 export LIB = @MOZ_LIB@
 export PATH = @MOZ_PATH@
+DLLFLAGS = @DLLFLAGS@
 endif
 endif
-DLLFLAGS = @DLLFLAGS@
 
 # python options.
 MOZ_PYTHON_EXTENSIONS = @MOZ_PYTHON_EXTENSIONS@
 MOZ_PYTHON = @MOZ_PYTHON@
 MOZ_PYTHON_PREFIX = @MOZ_PYTHON_PREFIX@
 MOZ_PYTHON_INCLUDES = @MOZ_PYTHON_INCLUDES@
 MOZ_PYTHON_LIBS = @MOZ_PYTHON_LIBS@
 MOZ_PYTHON_DEBUG_SUFFIX = @MOZ_PYTHON_DEBUG_SUFFIX@
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -140,17 +140,19 @@ endif
 NSPR_LIB_DIR = $(firstword $(filter -L%,$(NSPR_LIBS)))
 ifneq (,$(strip $(NSPR_LIB_DIR)))
 NSPR_LIB_DIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIB_DIR)))
 else
 NSPR_LIB_DIR = $(ABS_DIST)/lib
 endif
 # Can't pass this in DEFAULT_GMAKE_FLAGS because that overrides
 # definitions in NSS, so just export it into the sub-make's environment.
+ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_MEMORY))
 export DLLFLAGS
+endif
 # NSS makefiles are not safe for parallel execution.
 DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
 DEFAULT_GMAKE_FLAGS += CC="$(CC)"
 DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
 DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
 DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR=$(NSPR_INCLUDE_DIR)
 DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR)
 DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1