diff options
| -rwxr-xr-x | Meta/build-root-filesystem.sh | 3 | ||||
| -rw-r--r-- | Userland/Libraries/LibELF/DynamicLoader.cpp | 2 |
2 files changed, 4 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. diff --git a/Userland/Libraries/LibELF/DynamicLoader.cpp b/Userland/Libraries/LibELF/DynamicLoader.cpp index 8788679575..7ea06d02b6 100644 --- a/Userland/Libraries/LibELF/DynamicLoader.cpp +++ b/Userland/Libraries/LibELF/DynamicLoader.cpp @@ -70,6 +70,8 @@ DynamicLoader::DynamicLoader(int fd, String filename, void* data, size_t size) m_valid = validate(); if (m_valid) m_tls_size_of_current_object = calculate_tls_size(); + else + dbgln("Image validation failed for file {}", m_filename); } DynamicLoader::~DynamicLoader() |