diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-27 16:35:59 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-27 16:35:59 +0000 |
| commit | 8c4a80b585a3f40c2dd3eb01edfae8bc5e22d42a (patch) | |
| tree | 138098ad5f6850dd4024ec686e949a74cf7c0a4c /pkgs | |
| parent | 9c4cfc02ce8756c89563740cda5e733db985c13f (diff) | |
* Upgrade to gcc 3.3.3. Starting at 3.3.3, the gcc makefile checks
whether the system header file directory actually exists (when calling fixinc), so passing a non-existent directory no longer works. Instead we make a empty dummy directory. svn path=/nixpkgs/trunk/; revision=858
Diffstat (limited to 'pkgs')
| -rwxr-xr-x | pkgs/development/compilers/gcc/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/default.nix | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 1b35be16e4313..a5aa83cc61147 100755 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -3,6 +3,10 @@ . $stdenv/setup +FIXINC_DUMMY=$NIX_BUILD_TOP/dummy +mkdir $FIXINC_DUMMY + + preConfigure() { if test "$noSysDirs" = "1"; then @@ -60,7 +64,7 @@ postConfigure() { # header files from /usr/include. mf=gcc/Makefile sed \ - -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \ + -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = $FIXINC_DUMMY^" \ < $mf > $mf.tmp mv $mf.tmp $mf fi diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index dea31911048d4..cedd38dac843b 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -5,16 +5,12 @@ assert langC; derivation { - name = "gcc-3.3.2"; + name = "gcc-3.3.3"; system = stdenv.system; builder = ./builder.sh; src = fetchurl { - url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.3.2/gcc-3.3.2.tar.bz2; - md5 = "65999f654102f5438ac8562d13a6eced"; + url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2; + md5 = "3c6cfd9fcd180481063b4058cf6faff2"; }; -# src = fetchurl { -# url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2; -# md5 = "3c6cfd9fcd180481063b4058cf6faff2"; -# }; inherit stdenv noSysDirs langC langCC langF77; } |