@@ -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.
@@ -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()