gcc: drop spec-env patch from non-hardened builds #528170

The GCC_SPEC env var is really only used by the hardened minispec
logic, so drop it from the ebuilds that no longer support hardened.

diff --git a/sys-devel/gcc/gcc-4.4.7.ebuild b/sys-devel/gcc/gcc-4.4.7.ebuild
index 63c82ea76c79f3c96d39b701da97f870b4c22c9c..a90abccba3854c1cafa2e5622dceb07bf1449ffc 100644 (file)
--- a/sys-devel/gcc/gcc-4.4.7.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7.ebuild
@@ -26,6 +26,4 @@ src_prepare() {
        use vanilla && return 0
 
        sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-
-       [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
 }

diff --git a/sys-devel/gcc/gcc-4.5.4.ebuild b/sys-devel/gcc/gcc-4.5.4.ebuild
index a9e0b682f60910994d8bb4319e0b692d43e02c61..23f7d5fb3c0b0beac11b7732d338b6d0ecc48caa 100644 (file)
--- a/sys-devel/gcc/gcc-4.5.4.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4.ebuild
@@ -27,6 +27,4 @@ src_prepare() {
        use vanilla && return 0
 
        sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
-
-       [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
 }

diff --git a/sys-devel/gcc/gcc-4.6.4.ebuild b/sys-devel/gcc/gcc-4.6.4.ebuild
index e337431453b91c80974939934130e473fbaa3517..38a3179396f3df6b845775725f301cfff55f6f4a 100644 (file)
--- a/sys-devel/gcc/gcc-4.6.4.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4.ebuild
@@ -28,8 +28,4 @@ src_prepare() {
        fi
 
        toolchain_src_prepare
-
-       use vanilla && return 0
-
-       [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
 }