[gentoo-commits] proj/gcc-config:master commit in: /

[Sergei Trofimovich]

commit:     e8e4dd8786f39b2d2c682f385ea2c70b2b44022f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 08:46:16 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 08:46:16 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=e8e4dd87

gcc-config: don't recreate unused '.NATIVE' symlink.

As gcc-wrapper is gone nothing should use it anymore.

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 README     | 6 ------
 gcc-config | 7 ++++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/README b/README
index c3bf427..48183b2 100644
--- a/README
+++ b/README
@@ -56,12 +56,6 @@ Files, variables, things.
       Before Aug 2018 used to contain paths for cross-compilers.
       To be removed eventually.
 
-    /etc/env.d/gcc/.NATIVE -> x86_64-pc-linux-gnu-8.1.0 (link to target config)
-
-      Link to current native toolchain.
-
-    Before Aug 2018 was used by gcc binary wrapper. Not used nowadays.
-
 TODOs
 -----
 

diff --git a/gcc-config b/gcc-config
index aefdbc4..92e9014 100755
--- a/gcc-config
+++ b/gcc-config
@@ -656,14 +656,15 @@ switch_profile() {
 		fi
 
 		# Punt old files; maybe globs too much, but oh well
+		# 'NATIVE' and '.NATIVE' were used by gcc-wrapper before Aug 2018
+		# and are not used as wrapper is removed.
+		# '.NATIVE' was created before Sept 2019.
+		# We clean up both for now. Should be safe to remove in 2021.
 		rm -f \
 			"${GCC_ENV_D}/NATIVE" "${GCC_ENV_D}/.NATIVE" \
 			"${ENV_D}/05gcc" "${ENV_D}/05gcc-${CTARGET}" \
 			"${ENV_D}/05gcc-${CTARGET}"-* "${GCC_ENV_D}/config-${CTARGET}"-*
 
-		# Help out the gcc wrapper
-		ln -sf ${CC_COMP} "${GCC_ENV_D}/.NATIVE"
-
 		# Relocate random crap
 		local x libdir pkgconfdir
 		local mver=${CC_COMP_VERSION:0:3}