diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2021-01-28 17:39:04 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2021-01-28 17:39:04 +0000 |
| commit | 3e0c05e1b2bc2a045ad3b591b35c75b99eb950a6 (patch) | |
| tree | 2b50c82cdcc5d64401d97ce14869b674bfc2fc71 /sys/arch/i386 | |
| parent | 8455aa1a02f2fcc5186267efb611a5feb4a9416a (diff) | |
Again allow COPTS= to come from the environment again, and don't lose the
SMALL_KERNEL specific variations.
ok espie jsg
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 00e00a348af..d8ab48f8660 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.139 2020/08/17 17:23:59 deraadt Exp $ +# $OpenBSD: Makefile.i386,v 1.140 2021/01/28 17:39:03 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -38,7 +38,7 @@ CMACHFLAGS+= -fno-stack-protector .endif .if ${IDENT:M-DSMALL_KERNEL} SORTR= cat -COPTS?= -Oz -mno-retpoline +COPTIMIZE?= -Oz -mno-retpoline .elif ${COMPILER_VERSION:Mclang} CMACHFLAGS+= -mretpoline .endif @@ -48,8 +48,8 @@ CWARNFLAGS+= -Wno-address-of-packed-member -Wno-constant-conversion .endif DEBUG?= -g -COPTS?= -O2 -CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} +COPTIMIZE?= -O2 +CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTIMIZE} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} LINKFLAGS= -T ld.script -X --warn-common -nopie |