summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2001-05-09 00:21:49 +0000
committerwtc%netscape.com <devnull@localhost>2001-05-09 00:21:49 +0000
commit48739619553872c668e6e4cc1e22d788ee89b462 (patch)
tree89f35994099a18d13a2b8acd96ce4ac1965b2686
parentf2725d9ea9e472ef442056fe86f7fdc69241d801 (diff)
parent2aeedca957de8a9358d97295cf78690ffb565837 (diff)
downloadnss-hg-48739619553872c668e6e4cc1e22d788ee89b462.tar.gz
Bugzilla bug #77788: backed out the fix because it breaks
mozilla/security/nss/lib/fortcrypt/swfort/pkcs11. The manifest.mn file in that directory defines CFLAGS, before command.mk is included by the Makefile. (NSS_3_2_BRANCH)
-rw-r--r--security/coreconf/command.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/coreconf/command.mk b/security/coreconf/command.mk
index 77665f918..7789b3f7d 100644
--- a/security/coreconf/command.mk
+++ b/security/coreconf/command.mk
@@ -42,7 +42,7 @@ CCF = $(CC) $(CFLAGS)
LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
NFSPWD = $(NSINSTALL_DIR)/nfspwd
-CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
$(XCFLAGS)
RANLIB = echo
TAR = /bin/tar