Merge staging-next into staging

1 files changed, 13 insertions, 12 deletions

diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index b483372dea04f..6fd7d9f45db87 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -1,13 +1,14 @@
-{ lib, stdenv, glibc }:
+{ lib, stdenv, glibc, buildPackages }:
 
 let
   # Sanitizers are not supported on Darwin.
   # Sanitizer headers aren't available in older libc++ stdenvs due to a bug
-  sanitizersWorking = !stdenv.hostPlatform.isMusl && (
+  sanitizersWorking = (stdenv.buildPlatform == stdenv.hostPlatform) && !stdenv.isDarwin && !stdenv.hostPlatform.isMusl && (
     (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "5.0.0")
     || (stdenv.cc.isGNU && stdenv.isLinux)
   );
   staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib";
+  emulator = stdenv.hostPlatform.emulator buildPackages;
 in stdenv.mkDerivation {
   name = "cc-wrapper-test";
 
@@ -17,28 +18,28 @@ in stdenv.mkDerivation {
 
     printf "checking whether compiler builds valid C binaries... " >&2
     $CC -o cc-check ${./cc-main.c}
-    ./cc-check
+    ${emulator} ./cc-check
 
     printf "checking whether compiler builds valid C++ binaries... " >&2
     $CXX -o cxx-check ${./cxx-main.cc}
-    ./cxx-check
+    ${emulator} ./cxx-check
 
     ${lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) ''
       printf "checking whether compiler can build with CoreFoundation.framework... " >&2
       mkdir -p foo/lib
       $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c}
-      ./core-foundation-check
+      ${emulator} ./core-foundation-check
     ''}
 
 
     ${lib.optionalString (!stdenv.isDarwin) ''
       printf "checking whether compiler builds valid static C binaries... " >&2
       $CC ${staticLibc} -static -o cc-static ${./cc-main.c}
-      ./cc-static
+      ${emulator} ./cc-static
       ${lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast (lib.getVersion stdenv.cc.name) "8.0.0") ''
         printf "checking whether compiler builds valid static pie C binaries... " >&2
         $CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c}
-        ./cc-static-pie
+        ${emulator} ./cc-static-pie
       ''}
     ''}
 
@@ -46,7 +47,7 @@ in stdenv.mkDerivation {
     mkdir -p foo/include
     cp ${./foo.c} foo/include/foo.h
     NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" $CC -o cflags-check ${./cflags-main.c}
-    ./cflags-check
+    ${emulator} ./cflags-check
 
     printf "checking whether compiler uses NIX_LDFLAGS... " >&2
     mkdir -p foo/lib
@@ -57,20 +58,20 @@ in stdenv.mkDerivation {
       ${./foo.c}
 
     NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c}
-    ./ldflags-check
+    ${emulator} ./ldflags-check
 
     printf "Check whether -nostdinc and -nostdinc++ is handled correctly" >&2
     mkdir -p std-include
     cp ${./stdio.h} std-include/stdio.h
     NIX_DEBUG=1 $CC -I std-include -nostdinc -o nostdinc-main ${./nostdinc-main.c}
-    ./nostdinc-main
+    ${emulator} ./nostdinc-main
     $CXX -I std-include -nostdinc++ -o nostdinc-main++ ${./nostdinc-main.c}
-    ./nostdinc-main++
+    ${emulator} ./nostdinc-main++
 
     ${lib.optionalString sanitizersWorking ''
       printf "checking whether sanitizers are fully functional... ">&2
       $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
-      ./sanitizers
+      ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers
     ''}
 
     touch $out