diff options
author | Shea Levy <shea@shealevy.com> | 2022-05-02 17:15:18 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2022-05-06 10:54:52 -0400 |
commit | 504d38ae7ba872dbf3b9972d33c94912e56807ed (patch) | |
tree | 6249d93156f7640b5ddcd04c40fc74fde5a20217 /pkgs/development/compilers/gcc/9/default.nix | |
parent | 4447d4071bc69e2e18aef96aa14fc0ec835fd5cd (diff) | |
download | nixpkgs-504d38ae7ba872dbf3b9972d33c94912e56807ed.tar nixpkgs-504d38ae7ba872dbf3b9972d33c94912e56807ed.tar.gz nixpkgs-504d38ae7ba872dbf3b9972d33c94912e56807ed.tar.bz2 nixpkgs-504d38ae7ba872dbf3b9972d33c94912e56807ed.tar.lz nixpkgs-504d38ae7ba872dbf3b9972d33c94912e56807ed.tar.xz nixpkgs-504d38ae7ba872dbf3b9972d33c94912e56807ed.tar.zst nixpkgs-504d38ae7ba872dbf3b9972d33c94912e56807ed.zip |
cross: Allow Windows toolchains to use ucrt as libc.
Diffstat (limited to 'pkgs/development/compilers/gcc/9/default.nix')
-rw-r--r-- | pkgs/development/compilers/gcc/9/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 2ecfa1bb1cf..09e4ef3fdff 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -98,7 +98,7 @@ let majorVersion = "9"; ++ [ ../libsanitizer-no-cyclades-9.patch ]; /* Cross-gcc settings (build == host != target) */ - crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossMingw = targetPlatform != hostPlatform && targetPlatform.isMinGW; stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; @@ -311,7 +311,7 @@ stdenv.mkDerivation ({ }; } -// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.isMinGW && crossStageStatic) { makeFlags = [ "all-gcc" "all-target-libgcc" ]; installTargets = "install-gcc install-target-libgcc"; } |