diff options
| author | dim <dim@FreeBSD.org> | 2013-12-30 20:15:46 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2013-12-30 20:15:46 +0000 |
| commit | 5fce04bd49f3f5cc0cdad8752ecca4dd5682a21b (patch) | |
| tree | 0dad04d1ac565d14d7c55b2a8173f9128cc6509e /lib/atf | |
| parent | 8a773bc13424e791cea0f4c0136a48f9667e87c5 (diff) | |
| download | FreeBSD-src-5fce04bd49f3f5cc0cdad8752ecca4dd5682a21b.zip FreeBSD-src-5fce04bd49f3f5cc0cdad8752ecca4dd5682a21b.tar.gz | |
MFC r257532 (by adrian):
Fix this build for clang.
MFC r259730:
To avoid having to explicitly test COMPILER_TYPE for setting
clang-specific or gcc-specific flags, introduce the following new
variables for use in Makefiles:
CFLAGS.clang
CFLAGS.gcc
CXXFLAGS.clang
CXXFLAGS.gcc
In bsd.sys.mk, these get appended to the regular CFLAGS or CXXFLAGS for
the right compiler.
MFC r259913:
For libstand and sys/boot, split off gcc-only flags into CFLAGS.gcc.
MFC r259927:
Fix pc98 build, by also forcing COMPILER_TYPE in sys/boot/pc98/boot2's
Makefile.
Pointy hat to: dim
Diffstat (limited to 'lib/atf')
| -rw-r--r-- | lib/atf/libatf-c/tests/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile index 0d13d9c..a5c2836 100644 --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -10,12 +10,10 @@ ATF= ${.CURDIR:H:H:H:H}/contrib/atf CFLAGS+= -I${ATF} -.if ${COMPILER_TYPE} == "clang" # macros_test.c contains a double 'const const' which will be gone with # the import of atf-0.18. # TODO(jmmv): Remove this workaround once we do that update. -CFLAGS+= -Wno-duplicate-decl-specifier -.endif +CFLAGS.clang+= -Wno-duplicate-decl-specifier FILESDIR= ${TESTSDIR} FILES= macros_h_test.c |
