diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-14 10:22:33 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-06-14 15:05:18 -0400 |
commit | 1eacf21bd4cf88fe284bb1687e35a52389e6caac (patch) | |
tree | 0dd42bb6a043b6b02228316fa73fb771f9c6a92e /pkgs/development/compilers/llvm | |
parent | 3e3a9e661d7ef83f9dfc26d948a12f8ee1334f6d (diff) | |
download | nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar.gz nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar.bz2 nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar.lz nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar.xz nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.tar.zst nixlib-1eacf21bd4cf88fe284bb1687e35a52389e6caac.zip |
darwin bootstrapping: Avoid overriding aliases for LLVM
Respect the fix points and aliases by overriding originals.
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r-- | pkgs/development/compilers/llvm/3.7/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.8/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.9/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/4/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/5/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/6/default.nix | 8 |
6 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 4e1a0ef6409a..1bd4b88c72d4 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -16,7 +16,7 @@ let compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx"; clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa"; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv isl version fetch; }); in { llvm = callPackage ./llvm.nix { @@ -41,9 +41,9 @@ let }; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); in { @@ -54,6 +54,6 @@ let libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 3f0cd7d0a763..28f908ee829f 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -15,7 +15,7 @@ let compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d"; clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6"; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv isl version fetch; }); in { llvm = callPackage ./llvm.nix { @@ -41,9 +41,9 @@ let }; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); in { @@ -54,6 +54,6 @@ let libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index 3735fb6a02c0..ea3ea36eb6d3 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -15,7 +15,7 @@ let compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk"; clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999"; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv isl version fetch; }); in { llvm = callPackage ./llvm.nix { @@ -41,9 +41,9 @@ let }; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; }); in { @@ -54,6 +54,6 @@ let libcxx = callPackage ./libc++ {}; libcxxabi = callPackage ./libc++abi.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index c46e520a33df..ae674d1fa8e8 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -22,7 +22,7 @@ let let drv-manpages = drv.override { enableManpages = true; }; in drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -52,9 +52,9 @@ let lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -67,6 +67,6 @@ let libcxxabi = callPackage ./libc++abi.nix {}; openmp = callPackage ./openmp.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index feeadf1f1306..c3c1d87f2e4e 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -22,7 +22,7 @@ let let drv-manpages = drv.override { enableManpages = true; }; in drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -53,9 +53,9 @@ let lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -68,6 +68,6 @@ let libcxxabi = callPackage ./libc++abi.nix {}; openmp = callPackage ./openmp.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index bbac21ef6796..8fe68bad213d 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -21,7 +21,7 @@ let let drv-manpages = drv.override { enableManpages = true; }; in drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ }; - tools = let + tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -71,9 +71,9 @@ let lld = callPackage ./lld.nix {}; lldb = callPackage ./lldb.nix {}; - }; + }); - libraries = let + libraries = stdenv.lib.makeExtensible (libraries: let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); in { @@ -88,6 +88,6 @@ let libcxxabi = callPackage ./libc++abi.nix {}; openmp = callPackage ./openmp.nix {}; - }; + }); in { inherit tools libraries; } // libraries // tools |