summaryrefslogtreecommitdiff
path: root/Meta/build-root-filesystem.sh
diff options
context:
space:
mode:
authorGunnar Beutner <gbeutner@serenityos.org>2021-06-28 21:25:18 +0200
committerAndreas Kling <kling@serenityos.org>2021-06-28 22:29:28 +0200
commit0cb937416bdb6adc3a661d0f87f076ce24c4617f (patch)
tree359788b9166125f842d52600a2e8f1db7fdc1a3a /Meta/build-root-filesystem.sh
parent086b7a45375269f67056cd71d0503678f74d0da0 (diff)
downloadserenity-0cb937416bdb6adc3a661d0f87f076ce24c4617f.zip
Meta: Install 64-bit libgcc_s.so for x86_64 targets
Diffstat (limited to 'Meta/build-root-filesystem.sh')
-rwxr-xr-xMeta/build-root-filesystem.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh
index ec23d47451..0c36cfce77 100755
--- a/Meta/build-root-filesystem.sh
+++ b/Meta/build-root-filesystem.sh
@@ -40,7 +40,8 @@ else
$CP -PdR "$SERENITY_SOURCE_DIR"/Base/* mnt/
$CP -PdR Root/* mnt/
fi
-$CP "$SERENITY_SOURCE_DIR"/Toolchain/Local/i686/i686-pc-serenity/lib/libgcc_s.so mnt/usr/lib/
+SERENITY_ARCH="${SERENITY_ARCH:-i686}"
+$CP "$SERENITY_SOURCE_DIR"/Toolchain/Local/"$SERENITY_ARCH"/"$SERENITY_ARCH"-pc-serenity/lib/libgcc_s.so mnt/usr/lib/
# If umask was 027 or similar when the repo was cloned,
# file permissions in Base/ are too restrictive. Restore
# the permissions needed in the image.