pyrox.dev
rust: adjust env definition order (#358989)
authored by Arne Keller and committed by GitHub fa509ecc 1434a7ae
+10
-11
pkgs/build-support/rust/lib/default.nix
+10
-11
pkgs/build-support/rust/lib/default.nix
···
44
44
#
45
45
setEnv = ''
46
46
env \
47
+
"CC_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${ccForBuild}" \
48
+
"CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \
49
+
"CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForBuild}" \
50
+
"CARGO_BUILD_TARGET=${rustBuildPlatform}" \
51
+
"HOST_CC=${pkgsBuildHost.stdenv.cc}/bin/cc" \
52
+
"HOST_CXX=${pkgsBuildHost.stdenv.cc}/bin/c++" \
53
+
'' + ''
54
+
"CC_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${ccForHost}" \
55
+
"CXX_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${cxxForHost}" \
56
+
"CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForHost}" \
47
57
''
48
58
# Due to a bug in how splicing and pkgsTargetTarget works, in
49
59
# situations where pkgsTargetTarget is irrelevant
···
54
64
"CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \
55
65
"CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \
56
66
"CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \
57
-
'' + ''
58
-
"CC_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${ccForHost}" \
59
-
"CXX_${stdenv.hostPlatform.rust.cargoEnvVarTarget}=${cxxForHost}" \
60
-
"CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForHost}" \
61
-
'' + ''
62
-
"CC_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${ccForBuild}" \
63
-
"CXX_${stdenv.buildPlatform.rust.cargoEnvVarTarget}=${cxxForBuild}" \
64
-
"CARGO_TARGET_${stdenv.buildPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForBuild}" \
65
-
"CARGO_BUILD_TARGET=${rustBuildPlatform}" \
66
-
"HOST_CC=${pkgsBuildHost.stdenv.cc}/bin/cc" \
67
-
"HOST_CXX=${pkgsBuildHost.stdenv.cc}/bin/c++" \
68
67
'';
69
68
};
70
69
} // lib.mapAttrs (old: new: platform: