public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* gcc-wrapper: inherit gcc's name by default.

Browse Source 
* gcc: upgraded to 3.4.1.

  Zie je wel, Martin, gcc is niet eng :-)

svn path=/nixpkgs/trunk/; revision=1128
This commit is contained in:
Eelco Dolstra 2004-07-05 12:00:19 +00:00
parent 6315d6d923
commit 2bf90b3fbf
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/gcc-wrapper/default.nix
View File

@ -5,7 +5,7 @@
# stdenv.mkDerivation provides a wrapper that sets up the right environment # stdenv.mkDerivation provides a wrapper that sets up the right environment
# variables so that the compiler and the linker just "work". # variables so that the compiler and the linker just "work".
{ name, stdenv, nativeTools, nativeGlibc, nativePrefix ? "" { name ? "", stdenv, nativeTools, nativeGlibc, nativePrefix ? ""
, gcc ? null, glibc ? null, binutils ? null, shell ? "" , gcc ? null, glibc ? null, binutils ? null, shell ? ""
}: }:
@ -19,7 +19,8 @@ stdenv.mkDerivation {
gccWrapper = ./gcc-wrapper.sh; gccWrapper = ./gcc-wrapper.sh;
ldWrapper = ./ld-wrapper.sh; ldWrapper = ./ld-wrapper.sh;
utils = ./utils.sh; utils = ./utils.sh;
inherit name nativeTools nativeGlibc nativePrefix gcc glibc binutils; inherit nativeTools nativeGlibc nativePrefix gcc glibc binutils;
name = if name == "" then gcc.name else name;
langC = if nativeTools then true else gcc.langC; langC = if nativeTools then true else gcc.langC;
langCC = if nativeTools then true else gcc.langCC; langCC = if nativeTools then true else gcc.langCC;
langF77 = if nativeTools then false else gcc.langF77; langF77 = if nativeTools then false else gcc.langF77;

6
pkgs/development/compilers/gcc-3.4/default.nix
View File

@ -6,11 +6,11 @@
assert langC; assert langC;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gcc-3.4.0"; name = "gcc-3.4.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.4.0/gcc-3.4.0.tar.bz2; url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.4.1/gcc-3.4.1.tar.bz2;
md5 = "85c6fc83d51be0fbb4f8205accbaff59"; md5 = "31b459062499f9f68d451db9cbf3205c";
}; };
# !!! apply only if noSysDirs is set # !!! apply only if noSysDirs is set
patches = [./no-sys-dirs.patch]; patches = [./no-sys-dirs.patch];

1
pkgs/system/all-packages-generic.nix
View File

@ -207,7 +207,6 @@ rec {
}; };
gcc340 = (import ../build-support/gcc-wrapper) { gcc340 = (import ../build-support/gcc-wrapper) {
name = "gcc-3.4.0";
nativeTools = false; nativeTools = false;
nativeGlibc = false; nativeGlibc = false;
gcc = (import ../development/compilers/gcc-3.4) { gcc = (import ../development/compilers/gcc-3.4) {