MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-10 21:48:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'gcc-symlink' into 'master'

Browse Source 
Fix gcc13 install failure due to symlink

See merge request redox-os/cookbook!615
This commit is contained in:
Jeremy Soller 2025-09-10 14:33:21 -06:00
commit 39eae92f4c
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
recipes/dev/gcc13/recipe.toml
View File

@ -21,12 +21,8 @@ mkdir -p "${COOKBOOK_SYSROOT}/usr"
ln -sf "${COOKBOOK_SYSROOT}/include" "${COOKBOOK_SYSROOT}/usr/include" ln -sf "${COOKBOOK_SYSROOT}/include" "${COOKBOOK_SYSROOT}/usr/include"
ln -sf "${COOKBOOK_SYSROOT}/lib" "${COOKBOOK_SYSROOT}/usr/lib" ln -sf "${COOKBOOK_SYSROOT}/lib" "${COOKBOOK_SYSROOT}/usr/lib"
COOKBOOK_CONFIGURE_FLAGS=( COOKBOOK_CONFIGURE_FLAGS+=(
--host="${GNU_TARGET}"
--target="${GNU_TARGET}" --target="${GNU_TARGET}"
--prefix=/
--enable-shared
--disable-static
--with-sysroot=/ --with-sysroot=/
--with-build-sysroot="${COOKBOOK_SYSROOT}" --with-build-sysroot="${COOKBOOK_SYSROOT}"
--enable-languages=c,c++,lto --enable-languages=c,c++,lto
@ -40,9 +36,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
"${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}" "${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}"
"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" all-gcc all-target-libgcc all-target-libstdc++-v3 "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" all-gcc all-target-libgcc all-target-libstdc++-v3
"${COOKBOOK_MAKE}" install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="${COOKBOOK_STAGE}" "${COOKBOOK_MAKE}" install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="${COOKBOOK_STAGE}"
ln -s "gcc" "${COOKBOOK_STAGE}/bin/cc" ln -s "gcc" "${COOKBOOK_STAGE}/usr/bin/cc"
mkdir -p "${COOKBOOK_STAGE}/usr/libexec"
ln -s "/libexec/gcc" "${COOKBOOK_STAGE}/usr/libexec/gcc"
# Avoid conflict with libgcc & libstdcxx # Avoid conflict with libgcc & libstdcxx
rm -f "${COOKBOOK_STAGE}"/lib/libgcc_s.so* "${COOKBOOK_STAGE}"/lib/libstdc++.so* rm -f "${COOKBOOK_STAGE}"/usr/lib/libgcc_s.so* "${COOKBOOK_STAGE}"/usr/lib/libstdc++.so*
""" """