diff options
| author | Timon Kruiper <timonkruiper@gmail.com> | 2023-01-24 22:22:19 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2023-01-25 14:28:53 +0100 |
| commit | 3a802e365cffdd266d51f69e7fa1bb46c48e4397 (patch) | |
| tree | 8394ecc241921fde7565288a9b1ee90f3c393199 /Meta/build-root-filesystem.sh | |
| parent | 7eccacf4188d425193a695724ee446153dfbf50d (diff) | |
| download | serenity-3a802e365cffdd266d51f69e7fa1bb46c48e4397.zip | |
Meta: Unify installing GCC dependencies in disk image
This makes sure that the aarch64 disk image also contains the correct
dynamic shared objects, specifically libgcc_s.so.1, as that one is a
dynamic dependency of every aarch64 executable.
To unify the x86_64 and aarch64 code paths, this commit just installs
everything from the compilers lib directory into the disk image lib
directory. This also happens for the Clang toolchain. This copies a few
extra files related to libsupc++ and libstdc++, increasing the size of
the disk image by 1.6MB. However, we were already copying libstdc++.a
manually anyway.
Diffstat (limited to 'Meta/build-root-filesystem.sh')
| -rwxr-xr-x | Meta/build-root-filesystem.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh index 242af08bde..f986475c0b 100755 --- a/Meta/build-root-filesystem.sh +++ b/Meta/build-root-filesystem.sh @@ -50,9 +50,8 @@ if [ "$SERENITY_TOOLCHAIN" = "Clang" ]; then mkdir -p mnt/usr/include/"$SERENITY_ARCH"-pc-serenity $CP --preserve=timestamps -r "$TOOLCHAIN_DIR"/include/c++ mnt/usr/include $CP --preserve=timestamps -r "$TOOLCHAIN_DIR"/include/"$SERENITY_ARCH"-pc-serenity/c++ mnt/usr/include/"$SERENITY_ARCH"-pc-serenity -elif [ "$SERENITY_ARCH" != "aarch64" ]; then - $CP --preserve=timestamps "$SERENITY_SOURCE_DIR"/Toolchain/Local/"$SERENITY_ARCH"/"$SERENITY_ARCH"-pc-serenity/lib/libgcc_s.so mnt/usr/lib - $CP --preserve=timestamps "$SERENITY_SOURCE_DIR"/Toolchain/Local/"$SERENITY_ARCH"/"$SERENITY_ARCH"-pc-serenity/lib/libstdc++.a mnt/usr/lib +else + $CP --preserve=timestamps -r "$SERENITY_SOURCE_DIR"/Toolchain/Local/"$SERENITY_ARCH"/"$SERENITY_ARCH"-pc-serenity/lib/* mnt/usr/lib $CP --preserve=timestamps -r "$SERENITY_SOURCE_DIR"/Toolchain/Local/"$SERENITY_ARCH"/"$SERENITY_ARCH"-pc-serenity/include/c++ mnt/usr/include fi |