diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 07a003691d6b2..82bcf8bac21a0 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -213,9 +213,24 @@ preInstall() {
 
 postInstall() {
     # Move runtime libraries to $lib.
-    moveToOutput "lib/lib*.so*" "$lib"
-    moveToOutput "lib/lib*.la"  "$lib"
-    moveToOutput "lib/lib*.dylib" "$lib"
+    if [[ -n ${targetConfig} && -d "$out/$targetConfig/lib" && -n "$(ls -A $out/$targetConfig/lib)" ]]; then
+        moveToOutput "$targetConfig/lib/lib*.so*" "$lib"
+        moveToOutput "$targetConfig/lib/lib*.la" "$lib"
+        moveToOutput "$targetConfig/lib/lib*.dylib" "$lib"
+        mv "$lib/$targetConfig"/lib/* "$lib/lib/"
+        rmdir -p --ignore-fail-on-non-empty "$lib/$targetConfig/lib" || :
+    elif [[ -n ${targetConfig} && -d "$out/$targetConfig/lib64" && -n "$(ls -A $out/$targetConfig/lib64)" ]]; then
+        moveToOutput "$targetConfig/lib64/lib*.so*" "$lib"
+        moveToOutput "$targetConfig/lib64/lib*.la" "$lib"
+        moveToOutput "$targetConfig/lib64/lib*.dylib" "$lib"
+        mv "$lib/$targetConfig"/lib64/* "$lib/lib/"
+        rmdir -p --ignore-fail-on-non-empty "$lib/$targetConfig/lib64" || :
+    else
+        moveToOutput "lib/lib*.so*" "$lib"
+        moveToOutput "lib/lib*.la"  "$lib"
+        moveToOutput "lib/lib*.dylib" "$lib"
+    fi
+
     moveToOutput "share/gcc-*/python" "$lib"
 
     for i in "$lib"/lib/*.{la,py}; do
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d1ff681097dd7..e242d566d6bab 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -234,6 +234,6 @@ stdenv.mkDerivation ({
 
   # To avoid a dependency on the build system 'bash'.
   preFixup = ''
-    rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace}
+    rm -f $bin/bin/{ldd,tzselect,catchsegv,xtrace,sotruss}
   '';
 })