Author: shlevy
Date: Mon Dec 19 23:58:57 2011
New Revision: 30973
URL: https://nixos.org/websvn/nix/?rev=30973&sc=1
Log:
clang builds on darwin now
Also, get rid of the clang bootstrap, there's no need for it
Modified:
nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix Mon Dec 19
23:16:32 2011 (r30972)
+++ nixpkgs/trunk/pkgs/development/compilers/llvm/clang.nix Mon Dec 19
23:58:57 2011 (r30973)
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, perl, groff, llvm, cmake }:
+{ stdenv, fetchurl, perl, groff, llvm, cmake, darwinInstallNameToolUtility }:
let version = "3.0"; in
stdenv.mkDerivation {
name = "clang-${version}";
- buildInputs = [ perl llvm groff cmake ];
+ buildInputs = [ perl llvm groff cmake ] ++ stdenv.lib.optional
stdenv.isDarwin darwinInstallNameToolUtility;
patches = stdenv.lib.optionals (stdenv.gcc.libc != null)
[ ./clang-include-paths.patch ./clang-ld-flags.patch ];
@@ -33,7 +33,7 @@
description = "A C language family frontend for LLVM";
license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric shlevy];
- platforms = with stdenv.lib.platforms; linux;
+ platforms = with stdenv.lib.platforms; all;
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Dec 19 23:16:32
2011 (r30972)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Dec 19 23:58:57
2011 (r30973)
@@ -1665,17 +1665,12 @@
ccl = builderDefsPackage ../development/compilers/ccl {};
- clangBootUnwrapped = callPackage ../development/compilers/llvm/clang.nix {
+ clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix {
# There is a bug in gcc-4.5 that prevents building a release build of
# clang-3.0
- stdenv = stdenvAdapters.overrideGCC stdenv gcc46;
- };
-
- clangBoot = wrapClang clangBootUnwrapped;
-
- clangUnwrapped = let clangBootStdenv = stdenvAdapters.overrideGCC stdenv
clangBoot; in clangBootUnwrapped.override {
- stdenv = clangBootStdenv;
- llvm = llvm.override { stdenv = clangBootStdenv; };
+ stdenv = if stdenv.isLinux
+ then (stdenvAdapters.overrideGCC stdenv gcc46)
+ else stdenv;
};
clang = wrapClang clangUnwrapped;
@@ -2499,7 +2494,8 @@
clang = baseClang;
libc = glibc;
shell = bash;
- inherit stdenv binutils coreutils zlib;
+ binutils = stdenv.gcc.binutils;
+ inherit stdenv coreutils zlib;
};
wrapClang = wrapClangWith (import ../build-support/clang-wrapper) glibc;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
