From c4707ed0d9781df5a0797c1f1c4b0c63166ba3e8 Mon Sep 17 00:00:00 2001 From: Daniel Bertalan Date: Sat, 13 Nov 2021 13:25:00 +0100 Subject: [PATCH] Meta: Copy libc++ headers into the disk image If we do this, the LLVM port's Clang will pick up these paths, so we won't have to compile libc++ twice. This does increase the size of _disk_image by 5 MB, but that shouldn't be a problem. --- Meta/build-root-filesystem.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh index 8844ccdb57..16b954226f 100755 --- a/Meta/build-root-filesystem.sh +++ b/Meta/build-root-filesystem.sh @@ -50,9 +50,10 @@ LLVM_VERSION="${LLVM_VERSION:-13.0.0}" if [ "$SERENITY_TOOLCHAIN" = "Clang" ]; then TOOLCHAIN_DIR="$SERENITY_SOURCE_DIR"/Toolchain/Local/clang/ - mkdir -p mnt/usr/lib/clang/"$LLVM_VERSION"/lib/serenity - $CP "$TOOLCHAIN_DIR"/lib/clang/"$LLVM_VERSION"/lib/"$SERENITY_ARCH"-pc-serenity/* mnt/usr/lib/clang/"$LLVM_VERSION"/lib/serenity $CP "$TOOLCHAIN_DIR"/lib/"$SERENITY_ARCH"-pc-serenity/* mnt/usr/lib + mkdir -p mnt/usr/include/"$SERENITY_ARCH"-pc-serenity + $CP -r "$TOOLCHAIN_DIR"/include/c++ mnt/usr/include + $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 fi