diff options
| author | John Ericson <git@JohnEricson.me> | 2020-12-02 11:16:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 11:16:24 -0500 |
| commit | 68fa053f4697914bb1e7d9118484a39c650fd66b (patch) | |
| tree | 87b839844a53f335f9033be115f9286cd2b849fb /pkgs/development/compilers | |
| parent | a727aac01a70fe55e7f8d138cec54d58ea319caa (diff) | |
| parent | 47b99769f9dbc775950830f8a230fccadf46ab87 (diff) | |
Merge pull request #105383 from NixOS/more-rustc-musl
rustc: Improve musl support
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1fd3bbaba921..dab1f2a6bd81 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,5 +1,4 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget -, targetPackages , fetchurl, file, python3 , llvm_10, darwin, cmake, rust, rustPlatform , pkgconfig, openssl @@ -93,8 +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=${targetPackages.stdenv.cc.libc}" + "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" ]; # The bootstrap.py will generated a Makefile that then executes the build. |