diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-06-22 05:11:26 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-06-22 05:11:26 +0000 |
| commit | 4725a54d0cb00fdffd91606a7413de0299e1b873 (patch) | |
| tree | 261450b0b07f44e5936eedf44a6d89f71ae32fa5 | |
| parent | 9398633147790fe824cf88134f219f2cbc2f9f15 (diff) | |
| download | nss-hg-4725a54d0cb00fdffd91606a7413de0299e1b873.tar.gz | |
Bugzilla bug #84251: turn NO_MDUPDATE into USE_MDUPDATE and turn off
IRIX compiler warning 1209, which warns about do { } while (0) and
PR_ASSERT(0).
Modified files: IRIX.mk SunOS5.4_i86pc.mk SunOS5.mk
| -rw-r--r-- | security/coreconf/IRIX.mk | 9 | ||||
| -rw-r--r-- | security/coreconf/SunOS5.4_i86pc.mk | 7 | ||||
| -rw-r--r-- | security/coreconf/SunOS5.mk | 7 |
3 files changed, 10 insertions, 13 deletions
diff --git a/security/coreconf/IRIX.mk b/security/coreconf/IRIX.mk index cc976e04c..f74da36b3 100644 --- a/security/coreconf/IRIX.mk +++ b/security/coreconf/IRIX.mk @@ -58,7 +58,7 @@ ifdef NS_USE_GCC else CC = cc CCC = CC - ODD_CFLAGS = -fullwarn -xansi + ODD_CFLAGS = -fullwarn -xansi -woff 1209 ifdef BUILD_OPT ifeq ($(USE_N32),1) OPTIMIZER = -O -OPT:Olimit=4000 @@ -91,10 +91,9 @@ RANLIB = /bin/true # NOTE: should always define _SGI_MP_SOURCE NOMD_OS_CFLAGS += $(ODD_CFLAGS) -D_SGI_MP_SOURCE -ifndef NO_MDUPDATE - OS_CFLAGS += $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES) -else - OS_CFLAGS += $(NOMD_OS_CFLAGS) +OS_CFLAGS += $(NOMD_OS_CFLAGS) +ifdef USE_MDUPDATE + OS_CFLAGS += -MDupdate $(DEPENDENCIES) endif ifeq ($(USE_N32),1) diff --git a/security/coreconf/SunOS5.4_i86pc.mk b/security/coreconf/SunOS5.4_i86pc.mk index bed9893ed..35dfdb86a 100644 --- a/security/coreconf/SunOS5.4_i86pc.mk +++ b/security/coreconf/SunOS5.4_i86pc.mk @@ -43,10 +43,9 @@ ifdef NS_USE_GCC CCC = g++ CCC += -Wall -Wno-format ASFLAGS += -x assembler-with-cpp - ifdef NO_MDUPDATE - OS_CFLAGS += $(NOMD_OS_CFLAGS) - else - OS_CFLAGS += $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES) + OS_CFLAGS += $(NOMD_OS_CFLAGS) + ifdef USE_MDUPDATE + OS_CFLAGS += -MDupdate $(DEPENDENCIES) endif else CC = cc diff --git a/security/coreconf/SunOS5.mk b/security/coreconf/SunOS5.mk index 37b65293f..37c98c787 100644 --- a/security/coreconf/SunOS5.mk +++ b/security/coreconf/SunOS5.mk @@ -100,10 +100,9 @@ ifdef NS_USE_GCC CCC = g++ CCC += -Wall -Wno-format ASFLAGS += -x assembler-with-cpp - ifdef NO_MDUPDATE - OS_CFLAGS += $(NOMD_OS_CFLAGS) - else - OS_CFLAGS += $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES) + OS_CFLAGS += $(NOMD_OS_CFLAGS) + ifdef USE_MDUPDATE + OS_CFLAGS += -MDupdate $(DEPENDENCIES) endif OS_CFLAGS += $(ARCHFLAG) else |