diff options
| -rw-r--r-- | pkgs/development/compilers/ispc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
2 files changed, 1 insertions, 17 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 670729bb7e65..6c0d48780d32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6056,18 +6056,6 @@ with pkgs; clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { }; - clangSelf = clangWrapSelf llvmPackagesSelf.clang; - - clangWrapSelf = build: ccWrapperFun { - cc = build; - isClang = true; - inherit stdenvNoCC; - inherit (targetPackages.stdenv.cc) bintools libc; - extraPackages = [ libcxx libcxxabi ]; - nativeTools = false; - nativeLibc = false; - }; - #Use this instead of stdenv to build with clang clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; @@ -6704,10 +6692,6 @@ with pkgs; llvmPackages = recurseIntoAttrs llvmPackages_5; - llvmPackagesSelf = llvmPackages_34.override { - stdenv = libcxxStdenv; - }; - llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({ isl = isl_0_12; } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { |