From f29f9762a2d243ad2366b130bd1f15c240df0f7a Mon Sep 17 00:00:00 2001 From: Daniel Bertalan Date: Sun, 21 Nov 2021 07:53:14 +0100 Subject: 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. --- Meta/build-root-filesystem.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Meta/build-root-filesystem.sh') 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, -- cgit v1.2.3