From 0d7ac3f2ef60061573b907b708f2d6cc745d8c16 Mon Sep 17 00:00:00 2001 From: "gavin@gavinsharp.com" Date: Tue, 26 Feb 2008 10:30:21 -0800 Subject: [PATCH] Bustage fix from bug 415928, r=ted --- config/autoconf.mk.in | 4 ++-- security/manager/Makefile.in | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index c3bf1e86f37..fe1a26d6e89 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -571,9 +571,9 @@ ifdef MOZ_MEMORY ifneq (,$(WIN32_CRT_SRC_DIR)$(WIN32_CUSTOM_CRT_DIR)) export LIB = @MOZ_LIB@ export PATH = @MOZ_PATH@ -endif -endif DLLFLAGS = @DLLFLAGS@ +endif +endif # python options. MOZ_PYTHON_EXTENSIONS = @MOZ_PYTHON_EXTENSIONS@ diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in index 5b67d6c5a02..f142a7ffab3 100644 --- a/security/manager/Makefile.in +++ b/security/manager/Makefile.in @@ -145,7 +145,9 @@ 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)"