diff options
author | ru <ru@FreeBSD.org> | 2009-10-22 11:45:35 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2009-10-22 11:45:35 +0000 |
commit | e7d2f7c61c72d6e667b2ee49b78173c019dca03a (patch) | |
tree | ec324ca87e1adf36795dfebec13c034de2f698c7 | |
parent | 9fc9704227b1c604e74eb57da6c2e2a0feacc1be (diff) | |
download | FreeBSD-src-e7d2f7c61c72d6e667b2ee49b78173c019dca03a.zip FreeBSD-src-e7d2f7c61c72d6e667b2ee49b78173c019dca03a.tar.gz |
Unbreak NO_WARNS, keeping CSTD effect on CFLAGS out of its control.
Unbreak compiles with icc.
-rw-r--r-- | share/mk/bsd.sys.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index f0a40c9..9a189a6 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -11,7 +11,7 @@ # the default is gnu99 for now CSTD ?= gnu99 -.if !defined(NO_WARNS) || ${CC} != "icc" +.if ${CC} != "icc" . if ${CSTD} == "k&r" CFLAGS += -traditional . elif ${CSTD} == "c89" || ${CSTD} == "c90" @@ -23,6 +23,8 @@ CFLAGS += -std=iso9899:1999 . else CFLAGS += -std=${CSTD} . endif +.endif +.if !defined(NO_WARNS) && ${CC} != "icc" # -pedantic is problematic because it also imposes namespace restrictions #CFLAGS += -pedantic . if defined(WARNS) |