Author: ludo
Date: Wed Apr 6 12:52:33 2011
New Revision: 26714
URL: https://svn.nixos.org/websvn/nix/?rev=26714&sc=1
Log:
GCC 4.6: Add a version with debugging symbols.
Modified:
nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Wed Apr
6 12:52:29 2011 (r26713)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Wed Apr
6 12:52:33 2011 (r26714)
@@ -132,7 +132,7 @@
assert gtk != null -> (filter (x: x == null) xlibs) == [];
stdenv.mkDerivation ({
- name = "${name}-${version}" + crossNameAddon;
+ name = "${name}${if stripped then "" else "-debug"}-${version}" +
crossNameAddon;
builder = ./builder.sh;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Apr 6 12:52:29
2011 (r26713)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Apr 6 12:52:33
2011 (r26714)
@@ -1747,6 +1747,19 @@
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else
true;
}));
+ # A non-stripped version of GCC.
+ gcc46_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6
{
+ stripped = false;
+
+ inherit noSysDirs;
+ cross = null;
+ libcCross = null;
+ binutilsCross = null;
+
+ ppl = ppl0_11;
+ cloogppl = null;
+ }));
+
gccApple =
wrapGCC ( (if stdenv.system == "i686-darwin" then import
../development/compilers/gcc-apple else import
../development/compilers/gcc-apple64) {
inherit fetchurl stdenv noSysDirs;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
