mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-16 01:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

coreos: Add a user patch for sys-devel/gcc-config

Browse Source 
Makes a hack in script not necessary.
This commit is contained in:
Krzesimir Nowak 2023-01-11 14:28:04 +01:00
parent b5e038fe71
commit 32eb84eff2
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/gcc-config/0001-gcc-config-Use-relative-paths-for-liblto-and-cc-syml.patch vendored Normal file
View File

@ -0,0 +1,47 @@
From d245197378818f66c978d4427b6d0d81fbfaefc6 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 10 Nov 2022 16:45:48 +0100
Subject: [PATCH] gcc-config: Use relative paths for liblto and cc symlink
targets
That way, for ROOT different than / (like /build/amd64-usr) these
symlinks won't dangle after chrooting into ROOT.
Bug: https://bugs.gentoo.org/880977
Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
Closes: https://github.com/gentoo/gcc-config/pull/2
Signed-off-by: Sam James <sam@gentoo.org>
---
gcc-config | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gcc-config b/gcc-config
index a44fced..f39dd5c 100755
--- a/gcc-config
+++ b/gcc-config
@@ -345,7 +345,7 @@ update_wrappers() {
# 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"
+ atomic_ln "${CTARGET}-gcc" "${EROOT}usr/bin" "${CTARGET}-cc"
# handle the canonical cpp wrapper
if ! is_cross_compiler ; then
@@ -813,11 +813,12 @@ switch_profile() {
# Update LTO plugin for GCC. Supported as of binutils 2.25.
local BFD_PLUGINS_DIR
local LIBLTO_PLUGIN
- LIBLTO_PLUGIN="${EROOT}usr/libexec/gcc/${CTARGET}/${CC_COMP_VERSION}/liblto_plugin.so"
if is_cross_compiler; then
BFD_PLUGINS_DIR="${EROOT}usr/${CHOST}/${CTARGET}/binutils-bin/lib/bfd-plugins"
+ LIBLTO_PLUGIN="../../../../../libexec/gcc/${CTARGET}/${CC_COMP_VERSION}/liblto_plugin.so"
else
BFD_PLUGINS_DIR="${EROOT}usr/${CHOST}/binutils-bin/lib/bfd-plugins"
+ LIBLTO_PLUGIN="../../../../libexec/gcc/${CTARGET}/${CC_COMP_VERSION}/liblto_plugin.so"
fi
mkdir -p "${BFD_PLUGINS_DIR}"
ln -sf "${LIBLTO_PLUGIN}" "${BFD_PLUGINS_DIR}"
--
2.25.1

1
sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-devel/gcc-config/README.md vendored Normal file
View File

@ -0,0 +1 @@
Drop `0001-gcc-config-Use-relative-paths-for-liblto-and-cc-syml.patch` when we have gcc-config 2.10 or greater.