toolchain.eclass: don't delete 'go' and 'gofmt' for cross-compilers

gcc does not build final 'go' and 'gofmt' tools when cross-compiler is built (CHOST != CTARGET). This change fixes gcc-stage2 building for USE=go case. Signed-off-by: Sergei Trofimovich <[email protected]>
hanetzer · Oct 23, 2018 · 488929a · 488929a
1 parent 47087e6
commit 488929a
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
@@ -1815,12 +1815,17 @@ toolchain_src_install() {
  ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
  fi
  done
- # Rename the main go binaries as we don't want to clobber dev-lang/go
- # when gcc-config runs. #567806
- if tc_version_is_at_least 5 && is_go ; then
- for x in go gofmt; do
- mv ${x} ${x}-${GCCMAJOR} || die
- done
+
+ # When gcc builds a crosscompiler it does not install unprefixed tools.
+ # When cross-building gcc does install native tools.
+ if ! is_crosscompile; then
+ # Rename the main go binaries as we don't want to clobber dev-lang/go
+ # when gcc-config runs. #567806
+ if tc_version_is_at_least 5 && is_go ; then
+ for x in go gofmt; do
+ mv ${x} ${x}-${GCCMAJOR} || die
+ done
+ fi
  fi
 
  # Now do the fun stripping stuff