summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-26 16:54:19 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-26 16:54:19 +0000
commit3dafb81bf5d225a028911f114a5121b0f9699a84 (patch)
treef7edc2461963de276890d4e6156b441b759d7026
parent4ddf1694b26958aff1ebbc4d4e88bb87d340b2ed (diff)
downloadportage-3dafb81bf5d225a028911f114a5121b0f9699a84.tar.gz
portage-3dafb81bf5d225a028911f114a5121b0f9699a84.tar.bz2
portage-3dafb81bf5d225a028911f114a5121b0f9699a84.zip
Move the default empty compiler flag settings from
ebuild.sh to make.globals (bug #214499). svn path=/main/trunk/; revision=9511
-rwxr-xr-xbin/ebuild.sh6
-rw-r--r--cnf/make.globals5
2 files changed, 5 insertions, 6 deletions
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"