about summary refs log tree commit diff
path: root/pkgs/development/compilers/gcc-4.4
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-12-21 07:49:59 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-12-21 07:49:59 +0000
commit7ab9bff48aab6baf3c3f601f25ba29a0ddbb13be (patch)
tree2aea9cb8b57449722d5fdd95f7fac97f68a6f092 /pkgs/development/compilers/gcc-4.4
parentfb82bac2fcb7538195ec0941499a4d68cede83ed (diff)
downloadnixlib-7ab9bff48aab6baf3c3f601f25ba29a0ddbb13be.tar
nixlib-7ab9bff48aab6baf3c3f601f25ba29a0ddbb13be.tar.gz
nixlib-7ab9bff48aab6baf3c3f601f25ba29a0ddbb13be.tar.bz2
nixlib-7ab9bff48aab6baf3c3f601f25ba29a0ddbb13be.tar.lz
nixlib-7ab9bff48aab6baf3c3f601f25ba29a0ddbb13be.tar.xz
nixlib-7ab9bff48aab6baf3c3f601f25ba29a0ddbb13be.tar.zst
nixlib-7ab9bff48aab6baf3c3f601f25ba29a0ddbb13be.zip
I forgot a gcc flag in the last commit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19061
Diffstat (limited to 'pkgs/development/compilers/gcc-4.4')
-rw-r--r--pkgs/development/compilers/gcc-4.4/gnat-cflags.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc-4.4/gnat-cflags.patch b/pkgs/development/compilers/gcc-4.4/gnat-cflags.patch
new file mode 100644
index 000000000000..8e7c40778fcc
--- /dev/null
+++ b/pkgs/development/compilers/gcc-4.4/gnat-cflags.patch
@@ -0,0 +1,33 @@
+diff --git a/libada/Makefile.in b/libada/Makefile.in
+index f5057a0..337e0c6 100644
+--- a/libada/Makefile.in
++++ b/libada/Makefile.in
+@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)
+ WARN_CFLAGS = @warn_cflags@
+ 
+ TARGET_LIBGCC2_CFLAGS=
+-GNATLIBCFLAGS= -g -O2
++GNATLIBCFLAGS= -g -O2 $(CFLAGS)
+ 
+ # Get target-specific overrides for TARGET_LIBGCC2_CFLAGS.
+ host_subdir = @host_subdir@
+--- a/gcc/ada/gcc-interface/Makefile.in
++++ b/gcc/ada/gcc-interface/Makefile.in
+@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata
+ SOME_ADAFLAGS =-gnata
+ FORCE_DEBUG_ADAFLAGS = -g
+ GNATLIBFLAGS = -gnatpg -nostdinc
+-GNATLIBCFLAGS = -g -O2
++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
+ GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
+ 	-DIN_RTS
+ ALL_ADAFLAGS = $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS)
+@@ -1838,7 +1838,7 @@ ADA_INCLUDE_SRCS =\
+ 
+ LIBGNAT=../$(RTSDIR)/libgnat.a
+ 
+-GCC_LINK=$(CC) -static-libgcc $(ADA_INCLUDES)
++GCC_LINK=$(CC) -static-libgcc $(CFLAGS_FOR_TARGET) $(ADA_INCLUDES)
+ 
+ # when compiling the tools, the runtime has to be first on the path so that
+ # it hides the runtime files lying with the rest of the sources