diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-01-03 22:58:25 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-01-04 00:01:25 +0100 |
commit | de8e0bfaa7e8032ea6698c5d5cc34216604fcaa3 (patch) | |
tree | 0a530d7708c874689cf9d9823ff02d1452ad273e /pkgs/development/compilers/ghc | |
parent | 12af3ee5c596b0a6798b299c97336fa3f5f063ed (diff) | |
download | nixlib-de8e0bfaa7e8032ea6698c5d5cc34216604fcaa3.tar nixlib-de8e0bfaa7e8032ea6698c5d5cc34216604fcaa3.tar.gz nixlib-de8e0bfaa7e8032ea6698c5d5cc34216604fcaa3.tar.bz2 nixlib-de8e0bfaa7e8032ea6698c5d5cc34216604fcaa3.tar.lz nixlib-de8e0bfaa7e8032ea6698c5d5cc34216604fcaa3.tar.xz nixlib-de8e0bfaa7e8032ea6698c5d5cc34216604fcaa3.tar.zst nixlib-de8e0bfaa7e8032ea6698c5d5cc34216604fcaa3.zip |
haskell.compiler: also check targetPlatform for gmp compat
gmp is part of buildInputs _and_ depsTargetTarget, so we need to check the host and target platform to be correct. In practice this doesn't change much though, as gmp.meta.platforms is _quite_ liberal.
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/8.10.7.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.8.4.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.0.2.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.2.4.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.2.5.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.4.2.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.4.3.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/9.4.4.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/common-hadrian.nix | 3 |
9 files changed, 20 insertions, 9 deletions
diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index b7f027440de1..afc06e09edb0 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -21,7 +21,9 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 40dabc6c9837..be4ca5edb823 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -20,7 +20,9 @@ , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp + enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 0881b58ff717..f69e52701a93 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -23,7 +23,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.2.4.nix b/pkgs/development/compilers/ghc/9.2.4.nix index 68657c9178a0..6b8efae06e5b 100644 --- a/pkgs/development/compilers/ghc/9.2.4.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -23,7 +23,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix index 12511c761391..e7c75fcaccf9 100644 --- a/pkgs/development/compilers/ghc/9.2.5.nix +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -23,7 +23,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.2.nix index a3eb18e15687..d3702f4e849d 100644 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ b/pkgs/development/compilers/ghc/9.4.2.nix @@ -25,7 +25,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix index 2b0f206a6fb0..fea2d4c4c8c9 100644 --- a/pkgs/development/compilers/ghc/9.4.3.nix +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -25,7 +25,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/9.4.4.nix b/pkgs/development/compilers/ghc/9.4.4.nix index fafa24808489..b9897b0f4d82 100644 --- a/pkgs/development/compilers/ghc/9.4.4.nix +++ b/pkgs/development/compilers/ghc/9.4.4.nix @@ -25,7 +25,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index c54e6a4baf86..00f08c9a8023 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -48,7 +48,8 @@ , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. - enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp + && lib.meta.availableOn stdenv.targetPlatform gmp) , gmp , # If enabled, use -fPIC when compiling static libs. |