Merge branch 'more-gcc-fixes' into 'master'

Copy missing .o and .a files from prefix into the gcc package (Janky fix)

See merge request redox-os/cookbook!530
This commit is contained in:
Jeremy Soller 2025-07-07 06:37:18 -06:00
commit d2128d6bee
2 changed files with 4 additions and 2 deletions

View File

@ -41,5 +41,8 @@ COOKBOOK_CONFIGURE_FLAGS=(
"${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" all-gcc
"${COOKBOOK_MAKE}" install-gcc DESTDIR="${COOKBOOK_STAGE}"
ln -s "gcc" "${COOKBOOK_STAGE}/bin/cc"
ln -s "/libexec/gcc/${GNU_TARGET}/13.2.0/cc1" "${COOKBOOK_STAGE}/bin/cc1"
mkdir -p "${COOKBOOK_STAGE}/usr/libexec"
ln -s "/libexec/gcc" "${COOKBOOK_STAGE}/usr/libexec/gcc"
# TODO These files should be created in a recipe and added as a dependency for gcc13
cp -fpv "${COOKBOOK_HOST_SYSROOT}"/lib/gcc/"${GNU_TARGET}"/13.2.0/{*.o,*.a} "${COOKBOOK_STAGE}/lib"
"""

View File

@ -6,7 +6,6 @@ branch = "redox"
template = "custom"
script = """
rsync -av --delete "${COOKBOOK_SOURCE}/" ./
# "${COOKBOOK_MAKE}" -j "${COOKBOOK_MAKE_JOBS}" build-tests
mkdir -pv "${COOKBOOK_STAGE}/share/openposixtests"
rsync -av --delete . "${COOKBOOK_STAGE}/share/openposixtestsuite"
"""