Commit graph

199 commits

Author SHA1 Message Date
Shea Levy
291d203f80 Merge branch 'clang-stdenv' of https://github.com/Ralith/nixpkgs into staging 2015-06-28 15:54:06 -04:00
Benjamin Saunders
172ed10426 Fix libcxxStdenv on Linux
This corrects linkage failures arising from missing -lc++abi and
resolves "unused argument" warnings arising due to -stdlib=libc++
serving no purpose when search paths are being supplied explicitly.
2015-06-28 21:33:12 +02:00
Vladimír Čunát
61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
Jude Taylor
fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Matthew Maurer
6a76633bb6 llvm-3.4: enable RTTI (close #8289) 2015-06-11 22:09:46 +02:00
Eelco Dolstra
553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Vladimír Čunát
6732b3b8ad clang-3.4: fix build by adding zlib
I didn't care enough to search for cause of the regression.
2015-05-30 15:42:15 +02:00
William A. Kennington III
386575c0c2 llvm: 3.6.0 -> 3.6.1 2015-05-26 01:36:35 -07:00
Eelco Dolstra
279aca0f4b llvm: Don't depend on valgrind/gdb
See a4619673b5.
2015-05-13 18:17:26 +02:00
Eric Seidel
662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang}
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
2015-05-11 14:44:50 -07:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Peter Simons
fbfec3fc35 llvmPackages_34.dragonegg is broken because the required "ABIHack.inc" patch has disappeared upstream 2015-04-01 14:31:48 +02:00
William A. Kennington III
5cc82f8175 llvm: Enable RTTI for mesa 2015-03-28 13:50:22 -07:00
Eric Seidel
69d02b71a0 clang: add isClang passthru attribute to mirror isGNU 2015-03-24 20:37:01 -07:00
Shea Levy
6e3c9d5ce4 Fix fallout of recent cc-wrapper changes
Fixes tarball except for 56e21d05e8
2015-03-24 22:13:43 -04:00
Peter Simons
6694ef42a9 Merge branch 'master' into staging.
Conflicts:
      pkgs/development/libraries/gtk+/2.x.nix
      pkgs/tools/security/gnupg/21.nix
      pkgs/top-level/all-packages.nix
2015-03-10 12:09:43 +01:00
Eduard Bachmakov
4731485ca2 llvm-3.5: enable RTTI to support mesa
Extracted from #6367.
2015-03-09 15:55:23 +01:00
Shea Levy
e57e44f867 llvm-3.6 packages: Build everything (except clang and llvm) with clang 2015-03-07 13:08:34 +00:00
Shea Levy
b37fd11351 llvm-3.6 packages: Rearrange directory structure 2015-03-07 12:51:06 +00:00
Shea Levy
3ed077a69b lldb-3.5 is broken, bug in the cmake
lldb-3.6 is working (just waiting on a staging fix to merge), so let's just
mark this broken until we decide to nuke 3.5 all together.

Fixes #6636 refs #6668
2015-03-06 16:16:20 -05:00
Shea Levy
c62b5456f5 Merge branch 'llvm-3.6' of git://github.com/Ralith/nixpkgs into llvm-3.6-merge
LLVM, clang, and lldb 3.6iLLVM, clang, and lldb 3.6

Conflicts:
	pkgs/top-level/all-packages.nix
2015-03-06 19:10:10 +00:00
Shea Levy
6b53021205 Merge branch 'master' into staging 2015-03-06 19:02:36 +00:00
Shea Levy
55cf015142 clang-3.6: provide path to gcc on Linux
gcc contains core runtime bits that aren't available elsewhere for Linux.

Refs #6449
2015-03-06 13:49:49 +00:00
Shea Levy
494ae5fbeb clang: provide path to gcc on Linux
gcc contains core runtime bits that aren't available elsewhere for Linux.

Fixes #6449 refs #6668
2015-03-06 08:36:42 -05:00
Benjamin Saunders
f1b7e4d127 LLVM, clang, and lldb 3.6 2015-03-05 06:44:09 +01:00
Peter Simons
d6c295e469 Merge remote-tracking branch 'origin/master' into staging. 2015-02-25 20:18:28 +01:00
Vladimír Čunát
bc51573f8a dragonegg-3.5: fix by dropping included patch
It seems to compile a hello-world fine.
2015-02-23 09:37:07 +01:00
Eduard Bachmakov
c0def4a169 llvm-3.5: enable RTTI to support mesa
Extracted from #6367.
2015-02-22 20:03:14 +01:00
Luca Bruno
3391728c63 dragonegg: fix sha256 2015-02-20 14:51:24 +01:00
Dan Peebles
c6ce6460c4 Rearrange llvm dependencies slightly to avoid unnecessary dependencies on darwin (binutils is only used for gold integration, which doesn't apply on darwin) 2015-02-18 02:05:56 -05:00
Dan Peebles
3a423e4405 It doesn't appear to be necessary to force the libc++abi rpath in libc++, and removing it helps disentangle the upcoming darwin stdenv from its bootstrap tools 2015-02-17 22:39:31 -05:00
Dan Peebles
a29cc5a911 A build of libc++abi that doesn't rely on a full llvm build (more lightweight boostrap upcoming) 2015-02-08 13:38:29 -05:00
Dan Peebles
19c359ce2a substituteInPlace doesn't seem to work properly on this bash, so use sed instead 2015-02-08 03:04:41 -05:00
Dan Peebles
507d65d7d4 Get rid of default search paths in clang 3.5 2015-02-08 02:12:51 -05:00
Dan Peebles
c4253520fe These two are unused 2015-02-08 00:34:02 -05:00
Shea Levy
0e225c0e37 llvm-3.5: Don't try to use libc++ on linux 2015-02-04 11:30:25 -05:00
Eric Seidel
4a467ec02b move libcxx[abi] into llvm tree 2015-02-03 14:58:10 -08:00
Eric Seidel
fe49487a05 fix evaluation 2015-02-03 14:31:07 -08:00
Eric Seidel
2ca30151c2 add llvm-3.5 2015-02-03 13:58:32 -08:00
Vladimír Čunát
a0bf07827b mpc: also rename the attribute to libmpc
Attrnames and package names should be as close as possible to avoid confusion.
I took care not to confuse the two mpc things during the mass-replace,
so hopefully I suceeded (tarball still builds).
2015-01-17 09:55:32 +01:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Eelco Dolstra
a4619673b5 clang/llvm: Fewer build-time dependencies
Such as valgrind, dejagnu, tcl/tk, ...
2014-10-11 22:26:39 +02:00
Eelco Dolstra
cb9f69c052 llvm: Don't depend on Python on Darwin
There already is a Python in /usr/bin, so we don't need to build
another one.
2014-09-23 13:13:53 +02:00
Joel Taylor
fa9b1f9cda build nix head successfully 2014-09-09 13:54:57 -07:00
Eric Seidel
0577499d74 fix some packages on darwin 2014-09-09 13:54:26 -07:00
Joel Taylor
7da056233f wip libc++ 2014-09-09 13:54:25 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
e0c43e8d04 llvm: Removed unused versions 3.1 and 3.2 2014-07-22 13:56:26 +02:00
Vladimír Čunát
219cae447d llvmPackages: maintenance update to 3.4.2
Updated all that was released: llvm, clang, and libc++.
2014-06-20 00:23:52 +02:00
Vladimír Čunát
4d269593d2 dragonegg: fix build, probably after gcc minor update 2014-05-30 11:03:54 +02:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv
Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-29 22:16:07 +02:00
Vladimír Čunát
0430f59d64 llvmPackages.lld: fix build after 3.4.1 update
Somehow I forgot this package.
2014-05-16 18:29:12 +02:00
Vladimír Čunát
cf1dbbbf72 llvm+clang: maintenance update 3.4 -> 3.4.1
Slightly hacky for clang at some points, as directory names change strangely.
2014-05-15 21:02:28 +02:00
Ricardo M. Correia
f9cd53ba18 llvm: Add support for grsecurity 2014-05-15 13:25:47 +02:00
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