summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgcc-config9
1 files changed, 8 insertions, 1 deletions
diff --git a/gcc-config b/gcc-config
index 65a7ceb..512c41c 100755
--- a/gcc-config
+++ b/gcc-config
@@ -332,9 +332,16 @@ update_wrappers() {
rm -f "${EROOT}usr/bin/${x}"
fi
done
- # legacy cruft, make sure we dont leave it laying around #143205
+
+ # Legacy cruft, make sure we don't leave it laying around, as we used to install
+ # genuine wrappers like python-exec, bug #143205
rm -f "${EROOT}usr/bin/${CTARGET}-cc" "${EROOT}usr/bin"/{${CTARGET}-,}g{cc,++}{32,64}
+ # But create our own ${CTARGET}-cc in /usr/bin to avoid fallbacks
+ # to the symlinks LLVM creates (sys-devel/clang-toolchain-symlinks).
+ # bug #872416.
+ atomic_ln "${EROOT}usr/bin/${CTARGET}-gcc" "${EROOT}usr/bin" "${CTARGET}-cc"
+
# handle the canonical cpp wrapper
if ! is_cross_compiler ; then
if [[ ${USE_NATIVE_LINKS} == yes ]]; then