diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rustc.nix')
| -rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rustc.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 65d8920c4a4c..dab1f2a6bd81 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -70,9 +70,9 @@ in stdenv.mkDerivation rec { "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo" "--enable-rpath" "--enable-vendor" - "--build=${rust.toRustTarget stdenv.buildPlatform}" - "--host=${rust.toRustTarget stdenv.hostPlatform}" - "--target=${rust.toRustTarget stdenv.targetPlatform}" + "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" + "--host=${rust.toRustTargetSpec stdenv.hostPlatform}" + "--target=${rust.toRustTargetSpec stdenv.targetPlatform}" "${setBuild}.cc=${ccForBuild}" "${setHost}.cc=${ccForHost}" @@ -92,6 +92,12 @@ in stdenv.mkDerivation rec { "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [ "--enable-profiler" # build libprofiler_builtins + ] ++ optionals stdenv.buildPlatform.isMusl [ + "${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}" + ] ++ optionals stdenv.hostPlatform.isMusl [ + "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" + ] ++ optionals stdenv.targetPlatform.isMusl [ + "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" ]; # The bootstrap.py will generated a Makefile that then executes the build. |