From 9a7b35c9839bff809a7d4d5d3abbfb9822bde222 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sat, 7 May 2011 09:17:13 -0500 Subject: [PATCH] worlds/i386/SABA, worlds/i386/VITANI: propagate ae78f701ed7ce811fcd404ced985ed7ecedcfd80 - avoid overriding CFLAGS when building boot2 --- worlds/i386/SABA/config/src.conf | 9 +++++++-- worlds/i386/VITANI/config/src.conf | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/worlds/i386/SABA/config/src.conf b/worlds/i386/SABA/config/src.conf index 90b77d8..9e3dbe0 100644 --- a/worlds/i386/SABA/config/src.conf +++ b/worlds/i386/SABA/config/src.conf @@ -1,6 +1,11 @@ # Compilation knobs -CFLAGS+=-O2 -pipe -COPTFLAGS+=-O2 -pipe + +# Boot2 may build too large if -Os is overridden +.if !${.CURDIR:M*/sys/boot/i386/boot2} + CFLAGS+=-O2 -pipe + COPTFLAGS+=-O2 -pipe +.endif + CPUTYPE?=pentium4 # Kernel knobs diff --git a/worlds/i386/VITANI/config/src.conf b/worlds/i386/VITANI/config/src.conf index d880b4e..4165212 100644 --- a/worlds/i386/VITANI/config/src.conf +++ b/worlds/i386/VITANI/config/src.conf @@ -1,8 +1,13 @@ # Needs update to 8.2-RELEASE # Compilation knobs -CFLAGS+=-O2 -pipe -COPTFLAGS+=-O2 -pipe + +# Boot2 may build too large if -Os is overridden +.if !${.CURDIR:M*/sys/boot/i386/boot2} + CFLAGS+=-O2 -pipe + COPTFLAGS+=-O2 -pipe +.endif + CPUTYPE?=c3-2 # Kernel knobs -- 2.42.0