mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:33:03 +03:00
* Removed the old gcc.
svn path=/nixpkgs/trunk/; revision=825
This commit is contained in:
parent
b8b4f9ce4b
commit
ab73ec398b
@ -5,7 +5,7 @@ buildinputs="$binutils"
|
||||
|
||||
tar xvfj $src
|
||||
|
||||
if test "$noSysDirs" == "1"; then
|
||||
if test "$enforcePurity" = "1"; then
|
||||
# Disable the standard include directories.
|
||||
cd gcc-*
|
||||
cat >> ./gcc/cppdefault.h <<EOF
|
||||
@ -29,8 +29,9 @@ mkdir build
|
||||
cd build
|
||||
../gcc-*/configure --prefix=$out --enable-languages="$langs"
|
||||
|
||||
if test "$noSysDirs" == "1"; then
|
||||
if test "$enforcePurity" = "1"; then
|
||||
# Patch some of the makefiles to force linking against our own glibc.
|
||||
. $NIX_GCC/nix-support/add-flags # add glibc/gcc flags
|
||||
extraflags="-Wl,-s $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
|
||||
for i in $NIX_LDFLAGS; do
|
||||
extraflags="$extraflags -Wl,$i"
|
||||
|
@ -1,16 +1,20 @@
|
||||
{ stdenv, fetchurl, noSysDirs ? true
|
||||
{ stdenv, fetchurl, enforcePurity ? true
|
||||
, langC ? true, langCC ? true, langF77 ? false
|
||||
}:
|
||||
|
||||
assert langC;
|
||||
|
||||
derivation {
|
||||
name = "gcc-3.3.3";
|
||||
name = "gcc-3.3.2";
|
||||
system = stdenv.system;
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2;
|
||||
md5 = "3c6cfd9fcd180481063b4058cf6faff2";
|
||||
url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.3.2/gcc-3.3.2.tar.bz2;
|
||||
md5 = "65999f654102f5438ac8562d13a6eced";
|
||||
};
|
||||
inherit stdenv noSysDirs langC langCC langF77;
|
||||
# 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 enforcePurity langC langCC langF77;
|
||||
}
|
||||
|
@ -1,56 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
buildinputs="$binutils"
|
||||
. $stdenv/setup || exit 1
|
||||
|
||||
tar xvfj $src || exit 1
|
||||
|
||||
if test "$noSysDirs" == "1"; then
|
||||
# Disable the standard include directories.
|
||||
cd gcc-* || exit 1
|
||||
cat >> ./gcc/cppdefault.h <<EOF
|
||||
#undef LOCAL_INCLUDE_DIR
|
||||
#undef SYSTEM_INCLUDE_DIR
|
||||
#undef STANDARD_INCLUDE_DIR
|
||||
EOF
|
||||
cd .. || exit 1
|
||||
fi
|
||||
|
||||
# Configure.
|
||||
mkdir build || exit 1
|
||||
cd build || exit 1
|
||||
../gcc-*/configure --prefix=$out --enable-languages=c,c++ || exit 1
|
||||
|
||||
if test "$noSysDirs" == "1"; then
|
||||
# Patch some of the makefiles to force linking against our own glibc.
|
||||
extraflags="-Wl,-s $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
|
||||
for i in $NIX_LDFLAGS; do
|
||||
extraflags="$extraflags -Wl,$i"
|
||||
done
|
||||
|
||||
mf=Makefile
|
||||
sed \
|
||||
-e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraflags^" \
|
||||
< $mf > $mf.tmp || exit 1
|
||||
mv $mf.tmp $mf
|
||||
|
||||
mf=gcc/Makefile
|
||||
sed \
|
||||
-e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraflags^" \
|
||||
< $mf > $mf.tmp || exit 1
|
||||
mv $mf.tmp $mf
|
||||
|
||||
# Patch gcc/Makefile to prevent fixinc.sh from "fixing" system header files
|
||||
# from /usr/include.
|
||||
mf=gcc/Makefile
|
||||
sed \
|
||||
-e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \
|
||||
< $mf > $mf.tmp || exit 1
|
||||
mv $mf.tmp $mf
|
||||
fi
|
||||
|
||||
# Build and install.
|
||||
make bootstrap || exit 1
|
||||
make install || exit 1
|
||||
|
||||
find $out -name "*.a" -exec strip -S {} \; || exit 1
|
@ -1,12 +0,0 @@
|
||||
{stdenv, fetchurl, binutils}: derivation {
|
||||
name = "gcc-3.3.2";
|
||||
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";
|
||||
};
|
||||
stdenv = stdenv;
|
||||
binutils = binutils;
|
||||
noSysDirs = stdenv.noSysDirs;
|
||||
}
|
Loading…
Reference in New Issue
Block a user