From 934cf86cd8f20343c45f3f6bafb8de05c97459a1 Mon Sep 17 00:00:00 2001
From: Jonathan Perkin <jperkin@smartos.org>
Date: Wed, 20 Dec 2017 17:28:12 +0000
Subject: [PATCH] bootstrap: Do not save compiler flags to mk.conf.

We already set them explicitly in pkgbuild and besides avoiding
duplicates this also allows us to change them without having to rebuild
bootstrap.
---
 bootstrap/bootstrap | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 6900cdba301f..5b6b738e9c86 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1438,20 +1438,6 @@ if test -n "$XARGS"; then
 	echo "TOOLS_PLATFORM.xargs?=		$XARGS" >> ${TARGET_MKCONF}
 	echo "TOOLS_PLATFORM.xargs?=		$XARGS" >> ${BOOTSTRAP_MKCONF}
 fi
-if test -n "$CFLAGS"; then
-	echo "CFLAGS+=		$CFLAGS" >> ${TARGET_MKCONF}
-	echo "DBG=			# prevent DBG from adding default optimizer flags" >> ${TARGET_MKCONF}
-	echo "DBG=			# prevent DBG from adding default optimizer flags" >> ${BOOTSTRAP_MKCONF}
-fi
-if test -n "$CPPFLAGS"; then
-	echo "CPPFLAGS+=		$CPPFLAGS" >> ${TARGET_MKCONF}
-fi
-if test -n "$LDFLAGS"; then
-	echo "LDFLAGS+=		$LDFLAGS" >> ${TARGET_MKCONF}
-fi
-if test -n "$LIBS"; then
-	echo "LIBS+=		$LIBS" >> ${TARGET_MKCONF}
-fi
 if test -n "$MACOSX_DEPLOYMENT_TARGET"; then
 	echo "MACOSX_DEPLOYMENT_TARGET=	$MACOSX_DEPLOYMENT_TARGET" >>${TARGET_MKCONF}
 	echo "MACOSX_DEPLOYMENT_TARGET=	$MACOSX_DEPLOYMENT_TARGET" >>${BOOTSTRAP_MKCONF}