diff options
| author | obrien <obrien@FreeBSD.org> | 2003-06-01 22:13:45 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2003-06-01 22:13:45 +0000 |
| commit | 45f07c735955838c92492606d877644f4d7577cf (patch) | |
| tree | f30ee248f2f41524a56cf71513079ff84730b7fd /share | |
| parent | 9f4d72e270db95762cbf7a82c943096ebee282a2 (diff) | |
| download | FreeBSD-src-45f07c735955838c92492606d877644f4d7577cf.zip FreeBSD-src-45f07c735955838c92492606d877644f4d7577cf.tar.gz | |
Use a bigger hammer -- keep all -std= out of CXXFLAGS.
Also allow for "CSTD=" in a Makefile.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.sys.mk | 2 | ||||
| -rw-r--r-- | share/mk/sys.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index be5b9bf..25c7056 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -8,8 +8,8 @@ # for GCC: http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143 -.if !defined(PROG_CXX) CSTD ?= c99 +.if ${CSTD} != "" . if ${CSTD} == "k&r" CFLAGS += -traditional . elif ${CSTD} == "c89" || ${CSTD} == "c90" diff --git a/share/mk/sys.mk b/share/mk/sys.mk index edf461e..219ab7a 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -42,7 +42,7 @@ CC ?= cc CFLAGS ?= -O -pipe CXX ?= c++ -CXXFLAGS ?= ${CFLAGS} +CXXFLAGS ?= ${CFLAGS:C/-std=[a-z:0-9]+//} CPP ?= cpp |
