GCC 4.5: Remove explicit "-g0 -O2".

svn path=/nixpkgs/branches/stdenv-updates/; revision=26589
This commit is contained in:
Ludovic Courtès 2011-03-29 08:22:10 +00:00
parent 312680ff50
commit 9a9a6cd27e
2 changed files with 4 additions and 4 deletions

View File

@ -46,7 +46,7 @@ if test "$noSysDirs" = "1"; then
export NIX_FIXINC_DUMMY=/usr/include export NIX_FIXINC_DUMMY=/usr/include
fi fi
extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY $extraFlags" extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags"
extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
EXTRA_FLAGS="$extraFlags" EXTRA_FLAGS="$extraFlags"
@ -63,7 +63,7 @@ if test "$noSysDirs" = "1"; then
unset LIBRARY_PATH unset LIBRARY_PATH
unset CPATH unset CPATH
if test -z "$crossStageStatic"; then 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" EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib"
fi fi
else else
@ -89,7 +89,7 @@ if test "$noSysDirs" = "1"; then
# The path to the Glibc binaries such as `crti.o'. # The path to the Glibc binaries such as `crti.o'.
glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib" 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" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
EXTRA_TARGET_CFLAGS="$extraFlags" EXTRA_TARGET_CFLAGS="$extraFlags"

View File

@ -347,7 +347,7 @@ stdenv.mkDerivation ({
EXTRA_TARGET_CFLAGS = EXTRA_TARGET_CFLAGS =
if cross != null && libcCross != null if cross != null && libcCross != null
then "-g0 -O2 -idirafter ${libcCross}/include" then "-idirafter ${libcCross}/include"
else null; else null;
EXTRA_TARGET_LDFLAGS = EXTRA_TARGET_LDFLAGS =