Author: ludo
Date: Tue Mar 29 08:22:10 2011
New Revision: 26589
URL: https://svn.nixos.org/websvn/nix/?rev=26589&sc=1

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

Modified:
   nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh
   
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix

Modified: 
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh
==============================================================================
--- 
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh   
    Mon Mar 28 21:33:21 2011        (r26588)
+++ 
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/builder.sh   
    Tue Mar 29 08:22:10 2011        (r26589)
@@ -46,7 +46,7 @@
         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 @@
         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 @@
             # 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"

Modified: 
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
==============================================================================
--- 
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix  
    Mon Mar 28 21:33:21 2011        (r26588)
+++ 
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix  
    Tue Mar 29 08:22:10 2011        (r26589)
@@ -347,7 +347,7 @@
 
   EXTRA_TARGET_CFLAGS =
     if cross != null && libcCross != null
-    then "-g0 -O2 -idirafter ${libcCross}/include"
+    then "-idirafter ${libcCross}/include"
     else null;
 
   EXTRA_TARGET_LDFLAGS =
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to