From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 26 Mar 2008 16:54:19 +0000 (-0000)
Subject: Move the default empty compiler flag settings from
X-Git-Tag: v2.2_pre6~330
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3dafb81bf5d225a028911f114a5121b0f9699a84;p=portage.git

Move the default empty compiler flag settings from
ebuild.sh to make.globals (bug #214499).

svn path=/main/trunk/; revision=9511
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index e773c5558..b522f8db0 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -273,12 +273,6 @@ export LIBOPTIONS="-m0644"
 export DIROPTIONS="-m0755"
 export MOPREFIX=${PN}
 
-# When compiler flags are unset, many packages will substitute their own
-# implicit flags. For uniformity, use an empty string as the default.
-[ "${CFLAGS-unset}"    == "unset" ] && export CFLAGS=""
-[ "${CXXFLAGS-unset}"  == "unset" ] && export CXXFLAGS=""
-[ "${LDFLAGS-unset}"   == "unset" ] && export LDFLAGS=""
-
 check_KV() {
 	if [ -z "${KV}" ]; then
 		eerror ""
diff --git a/cnf/make.globals b/cnf/make.globals
index 0fd503c4b..36d8591ae 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -12,6 +12,11 @@
 # **  USE, CONFIG_*, and FEATURES are incremental  **
 # ***************************************************
 
+# When compiler flags are unset, many packages will substitute their own
+# implicit flags. For uniformity, use an empty string as the default.
+CFLAGS=""
+CXXFLAGS=""
+LDFLAGS=""
 
 # Default rsync mirror
 SYNC="rsync://rsync.gentoo.org/gentoo-portage"