From 8f1aa5e4668636151417fa6f1ad904fcaf12064b Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Mon, 18 Dec 2023 01:00:07 +0100
Subject: gcc-musl: Disable fixincludes

---
 src/compilers/gcc-13-musl.TARGETS | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/compilers')

diff --git a/src/compilers/gcc-13-musl.TARGETS b/src/compilers/gcc-13-musl.TARGETS
index 5d011f0..12bd1d4 100644
--- a/src/compilers/gcc-13-musl.TARGETS
+++ b/src/compilers/gcc-13-musl.TARGETS
@@ -150,7 +150,7 @@
           , "export MAKEINFO=missing"
           , "export BUILD_ROOT_DIR=${ACTION_DIR}"
           , "unset CFLAGS CXXFLAGS LDFLAGS"
-          , "GCC_CONFIG="
+          , "GCC_CONFIG='--disable-fixincludes'"
           ]
         , { "type": "if"
           , "cond": {"type": "var", "name": "MUSL_BUILD_STATIC"}
@@ -162,7 +162,7 @@
             , "export CXX=\"${TMPDIR}/host-g++\""
             , "export LDFLAGS='-static'"
             , "export LDFLAGS_FOR_TARGET='-static'"
-            , "GCC_CONFIG='--disable-shared'"
+            , "GCC_CONFIG=\"$GCC_CONFIG --disable-shared\""
             ]
           , "else": ["export LD_LIBRARY_PATH=\"$(dirname ${CC})/../lib64\""]
           }
@@ -181,9 +181,6 @@
           , "  ln -s $(basename $f) $(echo $f | sed 's|/'${TARGET}-'|/|g')"
           , "done"
           , "find . -type l -exec sh -c 'expr match \"$(readlink {})\" \"/\" >/dev/null' \\; -delete"
-          , "GCC_LIBDIR=\"lib/gcc/$(./bin/gcc -dumpmachine)/$(./bin/gcc -dumpfullversion -dumpversion)\""
-          , "mv ${GCC_LIBDIR}/include-fixed ${TMPDIR}/"
-          , "cp -rL ${TMPDIR}/include-fixed ${GCC_LIBDIR}/.   # resolve symlinks"
           ]
         ]
       }
-- 
cgit v1.2.3