diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2022-11-06 19:53:50 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2022-11-14 12:50:04 +0100 |
| commit | 890d0576c5f68852cd3d6ca81c5428122c620560 (patch) | |
| tree | a19b41c4f3d8b8bfed5e0e730db44a87c314b3ac /pkgs/development/compilers/gcc/9/default.nix | |
| parent | 801d535fab9d7dacbe1b79a6dfff0ededa71f194 (diff) | |
| download | nixpkgs-890d0576c5f68852cd3d6ca81c5428122c620560.tar nixpkgs-890d0576c5f68852cd3d6ca81c5428122c620560.tar.gz nixpkgs-890d0576c5f68852cd3d6ca81c5428122c620560.tar.bz2 nixpkgs-890d0576c5f68852cd3d6ca81c5428122c620560.tar.lz nixpkgs-890d0576c5f68852cd3d6ca81c5428122c620560.tar.xz nixpkgs-890d0576c5f68852cd3d6ca81c5428122c620560.tar.zst nixpkgs-890d0576c5f68852cd3d6ca81c5428122c620560.zip | |
cross/mingw: make threading library configureable
Diffstat (limited to 'pkgs/development/compilers/gcc/9/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/9/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index b970785d38e..4c49cdaa3e2 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -41,7 +41,7 @@ assert langGo -> langCC; assert langAda -> gnatboot != null; # threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; +assert threadsCross != {} -> stdenv.targetPlatform.isWindows; # profiledCompiler builds inject non-determinism in one of the compilation stages. # If turned on, we can't provide reproducible builds anymore @@ -71,7 +71,7 @@ let majorVersion = "9"; ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch # Obtain latest patch with ../update-mcfgthread-patches.sh - ++ optional (!crossStageStatic && targetPlatform.isMinGW) ./Added-mcf-thread-model-support-from-mcfgthread.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch ; /* Cross-gcc settings (build == host != target) */ @@ -180,7 +180,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ; - depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package; NIX_LDFLAGS = lib.optionalString hostPlatform.isSunOS "-lm -ldl"; @@ -198,7 +198,7 @@ stdenv.mkDerivation ({ lib stdenv targetPackages - crossStageStatic libcCross + crossStageStatic libcCross threadsCross version gmp mpfr libmpc isl |