git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #147253 from sternenseemann/ghc-build-target

haskell.compiler.*: be clear about LLVM build->target role

commit20a166d2603d76cba39ecbb8cb5907b34e59e457 authorJohn Ericson <git@JohnEricson.me> dateWed 24 Nov 2021, 14:43 (5 years ago) parent4f32620156d8d6
6 files changed+16−16
compare with master
unifiedsplit
pkgs/development/compilers/ghc/8.10.7.nix+2−2 pkgs/development/compilers/ghc/8.8.4.nix+2−2 pkgs/development/compilers/ghc/9.0.1.nix+2−2 pkgs/development/compilers/ghc/9.2.1.nix+2−2 pkgs/development/compilers/ghc/head.nix+2−2 pkgs/top-level/haskell-packages.nix+6−6
pkgs/development/compilers/ghc/8.10.7.nix+2−2
@@ -15,7 +15,7 @@
1515, # LLVM is conceptually a run-time-only depedendency, but for
1616 # non-x86, we need LLVM to bootstrap later stages, so it becomes a
1717 # build-time dependency too.
18− buildLlvmPackages, llvmPackages
18+ buildTargetLlvmPackages, llvmPackages
1919
2020, # If enabled, GHC will be built with the GPL-free but slower integer-simple
2121 # library instead of the faster but GPLed integer-gmp library.
@@ -122,7 +122,7 @@ let
122122
123123 toolsForTarget = [
124124 pkgsBuildTarget.targetPackages.stdenv.cc
125− ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
125+ ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
126126
127127 targetCC = builtins.head toolsForTarget;
128128
pkgs/development/compilers/ghc/8.8.4.nix+2−2
@@ -14,7 +14,7 @@
1414, # LLVM is conceptually a run-time-only depedendency, but for
1515 # non-x86, we need LLVM to bootstrap later stages, so it becomes a
1616 # build-time dependency too.
17− buildLlvmPackages, llvmPackages
17+ buildTargetLlvmPackages, llvmPackages
1818
1919, # If enabled, GHC will be built with the GPL-free but slower integer-simple
2020 # library instead of the faster but GPLed integer-gmp library.
@@ -130,7 +130,7 @@ let
130130
131131 toolsForTarget = [
132132 pkgsBuildTarget.targetPackages.stdenv.cc
133− ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
133+ ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
134134
135135 targetCC = builtins.head toolsForTarget;
136136
pkgs/development/compilers/ghc/9.0.1.nix+2−2
@@ -16,7 +16,7 @@
1616, # LLVM is conceptually a run-time-only depedendency, but for
1717 # non-x86, we need LLVM to bootstrap later stages, so it becomes a
1818 # build-time dependency too.
19− buildLlvmPackages, llvmPackages
19+ buildTargetLlvmPackages, llvmPackages
2020
2121, # If enabled, GHC will be built with the GPL-free but slower integer-simple
2222 # library instead of the faster but GPLed integer-gmp library.
@@ -117,7 +117,7 @@ let
117117
118118 toolsForTarget = [
119119 pkgsBuildTarget.targetPackages.stdenv.cc
120− ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
120+ ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
121121
122122 targetCC = builtins.head toolsForTarget;
123123
pkgs/development/compilers/ghc/9.2.1.nix+2−2
@@ -16,7 +16,7 @@
1616, # LLVM is conceptually a run-time-only depedendency, but for
1717 # non-x86, we need LLVM to bootstrap later stages, so it becomes a
1818 # build-time dependency too.
19− buildLlvmPackages, llvmPackages
19+ buildTargetLlvmPackages, llvmPackages
2020
2121, # If enabled, GHC will be built with the GPL-free but slower integer-simple
2222 # library instead of the faster but GPLed integer-gmp library.
@@ -117,7 +117,7 @@ let
117117
118118 toolsForTarget = [
119119 pkgsBuildTarget.targetPackages.stdenv.cc
120− ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
120+ ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
121121
122122 targetCC = builtins.head toolsForTarget;
123123
pkgs/development/compilers/ghc/head.nix+2−2
@@ -21,7 +21,7 @@
2121, # LLVM is conceptually a run-time-only depedendency, but for
2222 # non-x86, we need LLVM to bootstrap later stages, so it becomes a
2323 # build-time dependency too.
24− buildLlvmPackages, llvmPackages
24+ buildTargetLlvmPackages, llvmPackages
2525
2626, # If enabled, GHC will be built with the GPL-free but slightly slower native
2727 # bignum backend instead of the faster but GPLed gmp backend.
@@ -130,7 +130,7 @@ let
130130
131131 toolsForTarget = [
132132 pkgsBuildTarget.targetPackages.stdenv.cc
133− ] ++ lib.optional useLLVM buildLlvmPackages.llvm;
133+ ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm;
134134
135135 targetCC = builtins.head toolsForTarget;
136136
pkgs/top-level/haskell-packages.nix+6−6
@@ -1,4 +1,4 @@
1−{ buildPackages, pkgs, newScope, stdenv }:
1+{ buildPackages, pkgsBuildTarget, pkgs, newScope, stdenv }:
22
33let
44 # These are attributes in compiler and packages that don't support integer-simple.
@@ -79,7 +79,7 @@ in {
7979 else
8080 packages.ghc865Binary;
8181 inherit (buildPackages.python3Packages) sphinx;
82− buildLlvmPackages = buildPackages.llvmPackages_7;
82+ buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7;
8383 llvmPackages = pkgs.llvmPackages_7;
8484 };
8585 ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix {
@@ -96,7 +96,7 @@ in {
9696 # https://github.com/xattr/xattr/issues/44 and
9797 # https://github.com/xattr/xattr/issues/55 are solved.
9898 inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
99− buildLlvmPackages = buildPackages.llvmPackages_9;
99+ buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_9;
100100 llvmPackages = pkgs.llvmPackages_9;
101101 };
102102 ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
@@ -109,7 +109,7 @@ in {
109109 packages.ghc8107Binary;
110110 inherit (buildPackages.python3Packages) sphinx;
111111 inherit (buildPackages.darwin) autoSignDarwinBinariesHook;
112− buildLlvmPackages = buildPackages.llvmPackages_10;
112+ buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_10;
113113 llvmPackages = pkgs.llvmPackages_10;
114114 };
115115 ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix {
@@ -124,7 +124,7 @@ in {
124124 # https://github.com/xattr/xattr/issues/44 and
125125 # https://github.com/xattr/xattr/issues/55 are solved.
126126 inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
127− buildLlvmPackages = buildPackages.llvmPackages_10;
127+ buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_10;
128128 llvmPackages = pkgs.llvmPackages_10;
129129 };
130130 ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
@@ -134,7 +134,7 @@ in {
134134 # https://github.com/xattr/xattr/issues/44 and
135135 # https://github.com/xattr/xattr/issues/55 are solved.
136136 inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
137− buildLlvmPackages = buildPackages.llvmPackages_10;
137+ buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_10;
138138 llvmPackages = pkgs.llvmPackages_10;
139139 libffi = pkgs.libffi;
140140 };