diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-03-29 08:22:10 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-03-29 08:22:10 +0000 |
| commit | 9a9a6cd27e0fe6ade0d7f88d809d48cec2712952 (patch) | |
| tree | 104b9012696b4b3a532dc14b5e48716daddb8d39 /pkgs/development | |
| parent | 312680ff5089785b86756a7709aac2e0b3c92e7e (diff) | |
| download | nixpkgs-9a9a6cd27e0fe6ade0d7f88d809d48cec2712952.tar nixpkgs-9a9a6cd27e0fe6ade0d7f88d809d48cec2712952.tar.gz nixpkgs-9a9a6cd27e0fe6ade0d7f88d809d48cec2712952.tar.bz2 nixpkgs-9a9a6cd27e0fe6ade0d7f88d809d48cec2712952.tar.lz nixpkgs-9a9a6cd27e0fe6ade0d7f88d809d48cec2712952.tar.xz nixpkgs-9a9a6cd27e0fe6ade0d7f88d809d48cec2712952.tar.zst nixpkgs-9a9a6cd27e0fe6ade0d7f88d809d48cec2712952.zip | |
GCC 4.5: Remove explicit "-g0 -O2".
svn path=/nixpkgs/branches/stdenv-updates/; revision=26589
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.5/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc-4.5/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc-4.5/builder.sh b/pkgs/development/compilers/gcc-4.5/builder.sh index e684fbc951e..e1e56c8574a 100644 --- a/pkgs/development/compilers/gcc-4.5/builder.sh +++ b/pkgs/development/compilers/gcc-4.5/builder.sh @@ -46,7 +46,7 @@ if test "$noSysDirs" = "1"; then export NIX_FIXINC_DUMMY=/usr/include fi - extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY $extraFlags" + extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" EXTRA_FLAGS="$extraFlags" @@ -63,7 +63,7 @@ if test "$noSysDirs" = "1"; then unset LIBRARY_PATH unset CPATH if test -z "$crossStageStatic"; then - EXTRA_TARGET_CFLAGS="-g0 -O2 -B${libcCross}/lib -idirafter ${libcCross}/include" + EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include" EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib" fi else @@ -89,7 +89,7 @@ if test "$noSysDirs" = "1"; then # The path to the Glibc binaries such as `crti.o'. glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib" - extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY_CROSS $extraFlags" + extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" EXTRA_TARGET_CFLAGS="$extraFlags" diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 1acbb82702b..9d4aeaf01e1 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -347,7 +347,7 @@ stdenv.mkDerivation ({ EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null - then "-g0 -O2 -idirafter ${libcCross}/include" + then "-idirafter ${libcCross}/include" else null; EXTRA_TARGET_LDFLAGS = |