diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-05-23 09:15:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-23 09:15:00 -0400 |
commit | 5f1ec8e6d91483c9360de1ce341c09946417f317 (patch) | |
tree | e2bded49c0e5f9e4f3f7e5273ba0c2d78dd70f45 /pkgs/development | |
parent | c9d18a235c6297b99e750b85138cc9c06e27d458 (diff) | |
parent | acc9843691c936bb807fb6c5c88e0b41782d6c29 (diff) | |
download | nixlib-5f1ec8e6d91483c9360de1ce341c09946417f317.tar nixlib-5f1ec8e6d91483c9360de1ce341c09946417f317.tar.gz nixlib-5f1ec8e6d91483c9360de1ce341c09946417f317.tar.bz2 nixlib-5f1ec8e6d91483c9360de1ce341c09946417f317.tar.lz nixlib-5f1ec8e6d91483c9360de1ce341c09946417f317.tar.xz nixlib-5f1ec8e6d91483c9360de1ce341c09946417f317.tar.zst nixlib-5f1ec8e6d91483c9360de1ce341c09946417f317.zip |
Merge pull request #40961 from obsidiansystems/hash-preserving-llvm-cleanup
llvm, top-level: Baby steps towards cross support
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/ispc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.7/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.8/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/3.9/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/4/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/5/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/6/default.nix | 16 |
7 files changed, 47 insertions, 55 deletions
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 62fa578cef68..0fe9c8d3765f 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf, +{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 5cac04c044de..8f73645afc06 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -1,5 +1,7 @@ { newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl -, overrideCC, wrapCC, ccWrapperFun, darwin +, overrideCC, wrapCCWith, darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross }: let @@ -27,18 +29,14 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -48,7 +46,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index 9e37f93dbddc..a5f3b7759517 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -1,4 +1,8 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }: +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross +}: + let callPackage = newScope (self // { inherit stdenv isl version fetch; }); @@ -26,18 +30,14 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -47,7 +47,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index a675bcceb1c9..4b69996473d4 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -1,4 +1,8 @@ -{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }: +{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross +}: + let callPackage = newScope (self // { inherit stdenv isl version fetch; }); @@ -26,18 +30,14 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -47,7 +47,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lldb = callPackage ./lldb.nix {}; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 562f9e3457dd..594397bdbbc0 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,6 +1,8 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook -, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross }: let @@ -40,18 +42,14 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -61,7 +59,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 13e1d2308f8c..1f7619f7a371 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,6 +1,8 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook -, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross }: let @@ -40,18 +42,14 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -61,7 +59,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lld = callPackage ./lld.nix {}; diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index cfa9e9e15fcf..be26a38e32ec 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,6 +1,8 @@ { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook -, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun +, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith , darwin +, buildLlvmPackages # ourself, but from the previous stage, for cross +, targetLlvmPackages # ourself, but from the next stage, for cross }: let @@ -40,18 +42,14 @@ let clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang; - libstdcxxClang = ccWrapperFun { + libstdcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; extraPackages = [ libstdcxxHook ]; }; - libcxxClang = ccWrapperFun { + libcxxClang = wrapCCWith { cc = self.clang-unwrapped; - /* FIXME is this right? */ - inherit (stdenv.cc) bintools libc nativeTools nativeLibc; - extraPackages = [ self.libcxx self.libcxxabi ]; + extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ]; }; stdenv = stdenv.override (drv: { @@ -61,7 +59,7 @@ let libcxxStdenv = stdenv.override (drv: { allowedRequisites = null; - cc = self.libcxxClang; + cc = buildLlvmPackages.libcxxClang; }); lld = callPackage ./lld.nix {}; |