From 23f02598b8a7c41d1bef86ef339e25a39658d7e4 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 10 Jul 2014 00:15:55 +0000 Subject: [PATCH] Now that pc98 no longer needs gcc to compile boot2, remove the special case and treat it just like i386. --- share/mk/src.opts.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 5c2cb405bed..f7401161aff 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -205,14 +205,7 @@ __DEFAULT_NO_OPTIONS+=CLANG CLANG_FULL CLANG_BOOTSTRAP .if ${__T} == "amd64" || ${__T} == "arm" || ${__T} == "armv6" || \ ${__T} == "armv6hf" || ${__T} == "i386" __DEFAULT_YES_OPTIONS+=CLANG_IS_CC -__DEFAULT_NO_OPTIONS+=GNUCXX -# The pc98 bootloader requires gcc to build and so we must leave gcc enabled -# for pc98 for now. -.if ${__TT} == "pc98" -__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP -.else -__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP -.endif +__DEFAULT_NO_OPTIONS+=GNUCXX GCC GCC_BOOTSTRAP .else # If clang is not cc, then build gcc by default __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG CLANG_BOOTSTRAP