Commit graph

91 commits

Author SHA1 Message Date
Vladimír Čunát 07dc578572 llvm(Packages) on darwin: attempts to fix
- mark llvm34 as broken on darwin (so it doesn't install by default with nix-env)
- don't use our gcc for llvm_34 (might fix the build)
- switch also clang default to 3.3 on darwin (llvm was before)
2014-04-10 21:19:40 +02:00
Maxim Ivanov 2780cf2838 Fix -fsanitize=... options for clang
When using -fsanitize=... options clang implicitly
links binary to static libraries which are part of
llvm, but expects them to be found under clang prefix
2014-03-26 13:06:22 +00:00
Mathijs Kwik fc30e8e9b5 llvm: remove duplicate ncurses buildInput 2014-02-06 10:01:13 +01:00
Shea Levy 9cf29b7039 llvm: Propagate ncurses and zlib
Really shouldn't be needed with shared libs, should patch llvm-config

Fixes #1601

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-03 18:11:00 -05:00
Shea Levy 134546bca2 clang: Fix linking with -flto
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-02 20:39:16 -05:00
Shea Levy 86c587134b llvm-3.4: Try to fix build on darwin
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-02-02 19:47:59 -05:00
Eelco Dolstra e8a401a0c9 llvm-3.4: Only build on Linux
It doesn't build on Darwin because it depends on Valgrind:
http://hydra.nixos.org/build/8616143/nixlog/1/raw
2014-01-30 13:49:17 +01:00
Shea Levy 1cb628c2e7 clang: the --sysroot purity trick doesn't take care of the -dynamic-linker setting
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-27 12:50:21 -05:00
Shea Levy c0e93ca39d Unmaintain old llvm versions
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-26 21:01:13 -05:00
Vladimir Still 3209170626 LLVM: Allow building gold plugins together with llvm 3.{1,2}. 2014-01-26 22:53:27 +01:00
Vladimir Still 69af3f4a78 clang_31: Allow clang to find system includes in gcc dirs.
Backported fix.
2014-01-26 22:51:58 +01:00
Vladimir Still 11a7520928 llvm: Bring back old expressions for llvm & clang 3.[123]. 2014-01-26 19:16:50 +01:00
Shea Levy 407c60fdf9 Fix tarball
Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 20:33:06 -05:00
Shea Levy fea2266290 llvm: Split llvmFull into separate derivations
Now most packages in the llvm suite are built as separate derivations.
The exceptions are:

* compiler-rt must currently be built with llvm. This increases llvm's
  size by 6 MB
* clang-tools-extra must be built with clang

In addition, the top-level llvm attribute is defaulted to llvm 3.4, and
llvm 3.3 must be accessed by the llvm_33 attribute. This is to make the
out-of-date packages obvious in the hope that eventually all will be
updated to work with 3.4 and 3.3 can be removed. I think we should keep
this policy in the future (latest llvm gets top-level name, the rest are
versioned until they can be removed).

The llvm packages (except libc++, which exception I will try to remove
on the next update) can all be accessed via the llvmPackages attribute,
and there are also aliases for the packages that already existed (llvm,
clang, and dragonegg).

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 20:33:06 -05:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Shea Levy 55e6303d6a Add full llvm build, update libc++ and dragonegg
Some packages in the llvm suite (e.g. compiler-rt) cannot be built
separate from the build of llvm, and while some others (e.g. clang) can
the combined build is much better tested (we've had to work around
annoying issues before). So this puts llvm, clang, clang-tools-extra,
compiler-rt, lld, lldb, and polly all into one big build (llvmFull).
This build includes a static llvm, as dynamic is similarly less tested
and has known failures.

This also updates libc++ and dragonegg. libc++ now builds against
libc++abi as a separate package rather than building it during the
libc++ build.

The clang purity patch is gone. Instead, we simply set --sysroot to
/var/empty for pure builds, as all impure paths are either looked up in
the gcc prefix (which we hard-code at compile time) or in the sysroot.
This also means that if NIX_ENFORCE_PURITY is 0 then clang will look in
the normal Linux paths by default, which is the proper behavior IMO.

polly required an updated isl. When stdenv-updates is merged, perhaps we
can update the isl used by gcc and avoid having two versions.

Since llvm on its own is now separate from the llvm used by clang, I've
removed myself as maintainer from llvm and will leave maintenance of
that to those who are interested in llvm separate from clang.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 05:42:38 -05:00
Mathijs Kwik 6072a289fc llvm: no-rule-aarch64.patch is only needed on 3.3
the fix just missed 3.3 but it's in 3.4
see bottom of: http://llvm.org/bugs/show_bug.cgi?id=16625
2014-01-18 19:13:29 +01:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Vladimír Čunát ae0c9b626f llvm: add 3.4, urge for versioned usage
The 3.4 code was tested preliminary in x-updates,
described by 2e4eab1228.

Updates to llvm break builds of dependent packages (in all cases I've seen),
and often upstream isn't too fast in porting to the newest version.
Consequently, it seems better to keep more versions (two ATM),
both in one file to share eventual changes.
Also, using versioned llvm_* attributes is proposed because of this.
2014-01-13 21:53:50 +01:00
Vladimír Čunát 2265bab69d llvm: fix heavily parallel builds 2013-12-28 17:32:01 +01:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Vladimír Čunát 4855b0a22e dragonegg: fix build via update to 3.3 2013-12-11 12:14:01 +01:00
Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Vladimír Čunát 68430cf3d7 Merge branch master into x-updates
Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix
2013-11-16 20:32:44 +01:00
Petr Rockai 2c9f0e059a clang: Do not try to build clang-tblgen in LLVM's build path. 2013-11-16 13:53:48 +01:00
Vladimír Čunát 4bcdeb49a1 mesa: update 9.1.6 -> 9.2.1, enable R600 LLVM stuff 2013-10-05 21:18:35 +02:00
Vladimír Čunát 0adae9f822 llvm: add support for R600
It will be useful for mesa >= 9.2.*
Also, I want to restart the build on Hydra, as it succeeds for me.
2013-09-24 23:10:48 +02:00
Vladimír Čunát 9475e4d50a llvm (merge amend): fix evaluation
Regular binutils now include gold.
2013-09-02 15:45:29 +02:00
Petr Rockai 8bc805a211 llvm: Build the LLVMgold.so plugin for ld.gold &c.
Conflicts (simple):
	pkgs/development/compilers/llvm/default.nix
2013-08-18 21:35:17 +02:00
Vladimír Čunát 625f40151b Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
Peter Simons e2874236d3 llvm: fix meta.license attribute 2013-07-04 17:53:57 +02:00
Jason "Don" O'Conal 3b490b7ccb llvm: re-disabling tests
accidentally re-enabled doCheck, which isn't working yet
2013-07-04 19:02:40 +10:00
Jason "Don" O'Conal 67e5eb909b llvm: fix build on darwin
* add DYLD_LIBRARY_PATH
* don't build with shared libs
2013-07-04 08:48:55 +10:00
Shea Levy 6425ad2847 clang: Update to 3.3
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-21 19:50:56 -04:00
Shea Levy 9b502a9ae1 llvm: Update to 3.3
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-06-21 19:18:52 -04:00
Vladimír Čunát 14f36162d2 llvm: switch back to cmake build, so now clang builds 2013-06-01 23:36:38 +02:00
Vladimír Čunát d45b50ce6f llvm: add forgotten patch, WIP 2013-05-16 18:49:47 +02:00
Vladimír Čunát 70882b980c WARNING: history from now is going to change (mesa+llvm)
Current WIP, only tested nouveau (3D works very well).
2013-05-16 17:16:02 +02:00
Shea Levy 88864e331a Try to fix the tarball.
stdenv.gcc.gcc might be null, e.g. on ppc-linux

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 17:30:04 -04:00
Shea Levy c4edee4d39 clang: Pass the real gcc install prefix
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 15:18:37 -04:00
Vladimír Čunát 5f758e6ea3 dragonegg: fix via update 2013-02-23 14:57:31 +01:00
Shea Levy 296cd66009 clang requires libxlm2, on darwin at least 2013-01-22 16:29:28 -05:00
Shea Levy 857742ea22 clang/llvm: 3.2 2013-01-22 14:33:55 -05:00
Shea Levy 4f178d1698 clang: Bump to 3.1 2012-10-08 01:57:39 -04:00
Shea Levy 5a6fd3d510 llvm: Bump to 3.1 2012-10-07 23:25:11 -04:00
Michael Raskin f6b2f17bc3 Given that I have a vested interest in working LLVM now - add myself as maintainer
svn path=/nixpkgs/trunk/; revision=34302
2012-05-31 11:26:16 +00:00
Michael Raskin 2de23edd59 Adding LLVM 3.1. (as a separate attribute, because it seems to be API-incompatible)
svn path=/nixpkgs/trunk/; revision=34300
2012-05-31 11:04:28 +00:00
Ludovic Courtès 04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Shea Levy cd83eb3173 Build clang to support all of llvm's targets
svn path=/nixpkgs/trunk/; revision=33518
2012-04-01 14:33:23 +00:00