diff options
| author | imp <imp@FreeBSD.org> | 2010-02-18 15:12:48 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-02-18 15:12:48 +0000 |
| commit | f2ff87aff3d1eb5cdc4350c4730a8ca5cf8eef97 (patch) | |
| tree | b1d92c08fe6b3ea570c77ab75afcc06d6d08c333 /share | |
| parent | 0c502b0e9e6d493a6e20da8631bbf1941836247c (diff) | |
| parent | ffb08c6fd3e283de1c77c3ac7c8834a367b7f6c7 (diff) | |
| download | FreeBSD-src-f2ff87aff3d1eb5cdc4350c4730a8ca5cf8eef97.zip FreeBSD-src-f2ff87aff3d1eb5cdc4350c4730a8ca5cf8eef97.tar.gz | |
Merge from head.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.prog.mk | 1 | ||||
| -rw-r--r-- | share/mk/bsd.sys.mk | 5 | ||||
| -rw-r--r-- | share/mk/sys.mk | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index c8f2f72..4de78cb 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -17,6 +17,7 @@ NO_WERROR= .if defined(DEBUG_FLAGS) CFLAGS+=${DEBUG_FLAGS} +CXXFLAGS+=${DEBUG_FLAGS} .if !defined(NO_CTF) && (${DEBUG_FLAGS:M-g} != "") CTFFLAGS+= -g diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 4d8b76b..8d0e24a 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -43,7 +43,10 @@ CWARNFLAGS += -W -Wno-unused-parameter -Wstrict-prototypes\ . endif . if ${WARNS} >= 4 CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\ - -Wshadow -Wcast-align -Wunused-parameter + -Wshadow -Wunused-parameter +. if !defined(NO_WCAST_ALIGN) +CWARNFLAGS += -Wcast-align +. endif . endif # BDECFLAGS . if ${WARNS} >= 6 diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 042c7b9..3d517a3 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -78,7 +78,7 @@ CFLAGS += -g .endif CXX ?= c++ -CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} +CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign:N-Wold-style-definition} PO_CXXFLAGS ?= ${CXXFLAGS} CPP ?= cpp |
