summaryrefslogtreecommitdiff
path: root/Meta/build-root-filesystem.sh
diff options
context:
space:
mode:
authorDaniel Bertalan <dani@danielbertalan.dev>2021-11-21 07:53:14 +0100
committerBrian Gianforcaro <b.gianfo@gmail.com>2021-11-28 09:38:57 -0800
commitf29f9762a2d243ad2366b130bd1f15c240df0f7a (patch)
tree926b65a5e9efd4d515e3024c1c63b9686a390a90 /Meta/build-root-filesystem.sh
parentc4707ed0d9781df5a0797c1f1c4b0c63166ba3e8 (diff)
downloadserenity-f29f9762a2d243ad2366b130bd1f15c240df0f7a.zip
Meta: Copy libstdc++ into the disk image
With this, we can now compile C++ programs with the LLVM port without having to jump through hooks to build libc++ because it can't be cross-compiled with our GNU toolchain.
Diffstat (limited to 'Meta/build-root-filesystem.sh')
-rwxr-xr-xMeta/build-root-filesystem.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh
index 16b954226f..14bd84bb8c 100755
--- a/Meta/build-root-filesystem.sh
+++ b/Meta/build-root-filesystem.sh
@@ -56,6 +56,8 @@ if [ "$SERENITY_TOOLCHAIN" = "Clang" ]; then
$CP -r "$TOOLCHAIN_DIR"/include/"$SERENITY_ARCH"-pc-serenity/c++ mnt/usr/include/"$SERENITY_ARCH"-pc-serenity
elif [ "$SERENITY_ARCH" != "aarch64" ]; then
$CP "$SERENITY_SOURCE_DIR"/Toolchain/Local/"$SERENITY_ARCH"/"$SERENITY_ARCH"-pc-serenity/lib/libgcc_s.so mnt/usr/lib
+ $CP "$SERENITY_SOURCE_DIR"/Toolchain/Local/"$SERENITY_ARCH"/"$SERENITY_ARCH"-pc-serenity/lib/libstdc++.a mnt/usr/lib
+ $CP -r "$SERENITY_SOURCE_DIR"/Toolchain/Local/"$SERENITY_ARCH"/"$SERENITY_ARCH"-pc-serenity/include/c++ mnt/usr/include
fi
# If umask was 027 or similar when the repo was cloned,