pyrox.dev
Merge #196909: stdenvBootstrapTools: fix cycle on aarch64-darwin
...into staging
+1
-1
pkgs/development/compilers/llvm/10/compiler-rt/default.nix
+1
-1
pkgs/development/compilers/llvm/10/compiler-rt/default.nix
···
25
25
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
26
26
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
27
27
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
28
-
] ++ lib.optionals (haveLibc && !isMusl) [
28
+
] ++ lib.optionals (haveLibc && stdenv.hostPlatform.isGnu) [
29
29
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
30
30
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
31
31
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+1
-1
pkgs/development/compilers/llvm/11/compiler-rt/default.nix
+1
-1
pkgs/development/compilers/llvm/11/compiler-rt/default.nix
···
26
26
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
27
27
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
28
28
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
29
-
] ++ lib.optionals (haveLibc && !isMusl) [
29
+
] ++ lib.optionals (haveLibc && stdenv.hostPlatform.isGnu) [
30
30
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
31
31
] ++ lib.optionals (useLLVM || bareMetal || isMusl || isNewDarwinBootstrap) [
32
32
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+1
-1
pkgs/development/compilers/llvm/12/compiler-rt/default.nix
+1
-1
pkgs/development/compilers/llvm/12/compiler-rt/default.nix
···
26
26
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
27
27
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
28
28
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
29
-
] ++ lib.optionals (haveLibc && !isMusl) [
29
+
] ++ lib.optionals (haveLibc && stdenv.hostPlatform.isGnu) [
30
30
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
31
31
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
32
32
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+1
-1
pkgs/development/compilers/llvm/13/compiler-rt/default.nix
+1
-1
pkgs/development/compilers/llvm/13/compiler-rt/default.nix
···
28
28
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
29
29
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
30
30
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
31
-
] ++ lib.optionals (haveLibc && !isMusl) [
31
+
] ++ lib.optionals (haveLibc && stdenv.hostPlatform.isGnu) [
32
32
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
33
33
] ++ lib.optionals (useLLVM || bareMetal || isMusl || isAarch64) [
34
34
"-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
+1
-1
pkgs/development/compilers/llvm/14/compiler-rt/default.nix
+1
-1
pkgs/development/compilers/llvm/14/compiler-rt/default.nix
···
38
38
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
39
39
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
40
40
"-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
41
-
] ++ lib.optionals (haveLibc && !isMusl) [
41
+
] ++ lib.optionals (haveLibc && stdenv.hostPlatform.isGnu) [
42
42
"-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include"
43
43
] ++ lib.optionals (useLLVM || bareMetal || isMusl) [
44
44
"-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+13
-5
pkgs/development/tools/xcbuild/wrapper.nix
+13
-5
pkgs/development/tools/xcbuild/wrapper.nix
···
1
-
{ lib, stdenv, makeWrapper, writeText, writeShellScriptBin, runCommand
1
+
{ lib, stdenv, makeWrapper, writeText, writeTextFile, runCommand, callPackage
2
2
, CoreServices, ImageIO, CoreGraphics
3
-
, runtimeShell, callPackage
4
3
, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX"
5
4
, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1"
6
5
, sdkVer ? stdenv.targetPlatform.darwinSdkVersion or "10.12" }:
···
37
36
'';
38
37
39
38
xcode-select = writeText "xcode-select" ''
40
-
#!${runtimeShell}
39
+
#!${stdenv.shell}
41
40
while [ $# -gt 0 ]; do
42
41
case "$1" in
43
42
-h | --help) ;; # noop
···
51
50
done
52
51
'';
53
52
54
-
xcrun = writeShellScriptBin "xcrun" ''
53
+
xcrun = writeTextFile {
54
+
name = "xcrun";
55
+
executable = true;
56
+
destination = "/bin/xcrun";
57
+
text = ''
58
+
#!${stdenv.shell}
55
59
args=( "$@" )
56
60
57
61
# If an SDK was requested, check that it matches.
···
94
98
if ! [[ -z "$@" ]]; then
95
99
exec "$@"
96
100
fi
97
-
'';
101
+
'';
102
+
checkPhase = ''
103
+
${stdenv.shellDryRun} "$target"
104
+
'';
105
+
};
98
106
99
107
in
100
108