Merge pull request #106925 from Mic92/fix-darwin

tests.cc-wrapper: disable static compilation macOS
This commit is contained in:
Jörg Thalheim 2020-12-15 03:28:03 +00:00 committed by GitHub
commit 2076311230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -30,14 +30,17 @@ in stdenv.mkDerivation {
./core-foundation-check ./core-foundation-check
''} ''}
printf "checking whether compiler builds valid static C binaries... " >&2
$CC ${staticLibc} -static -o cc-static ${./cc-main.c} ${optionalString (!stdenv.isDarwin) ''
./cc-static printf "checking whether compiler builds valid static C binaries... " >&2
# our glibc does not have pie enabled yet. $CC ${staticLibc} -static -o cc-static ${./cc-main.c}
${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) '' ./cc-static
printf "checking whether compiler builds valid static pie C binaries... " >&2 # our glibc does not have pie enabled yet.
$CC ${staticLibc} -static-pie -o cc-static-pie ${./cc-main.c} ${optionalString (stdenv.hostPlatform.isMusl && stdenv.cc.isGNU) ''
./cc-static-pie 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
''}
''} ''}
printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2