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 /sys/boot/i386/boot2/Makefile | |
| 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 'sys/boot/i386/boot2/Makefile')
| -rw-r--r-- | sys/boot/i386/boot2/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index 68e49ed..8f1c150 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -23,10 +23,7 @@ BOOT2_UFS?= UFS1_AND_UFS2 #BOOT2_UFS?= UFS1_ONLY CFLAGS= -Os \ - -fno-guess-branch-probability \ -fomit-frame-pointer \ - -fno-unit-at-a-time \ - -mno-align-long-strings \ -mrtd \ -mregparm=3 \ -DUSE_XREAD \ @@ -43,6 +40,10 @@ CFLAGS= -Os \ -Winline --param max-inline-insns-single=100 \ ${CLANG_OPT_SMALL} +CFLAGS.gcc+= -fno-guess-branch-probability \ + -fno-unit-at-a-time \ + -mno-align-long-strings \ + LDFLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. |
