Author: viric
Date: Tue Nov 9 19:18:37 2010
New Revision: 24632
URL: https://svn.nixos.org/websvn/nix/?rev=24632&sc=1
Log:
Updating a gnat patch made for 4.4 to 4.5
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/gnat-cflags.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/gnat-cflags.patch
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/gnat-cflags.patch
Tue Nov 9 18:42:59 2010 (r24631)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/gnat-cflags.patch
Tue Nov 9 19:18:37 2010 (r24632)
@@ -22,12 +22,12 @@
# Pretend that _Unwind_GetIPInfo is available for the target by default. This
# should be autodetected during the configuration of libada and passed down to
# here, but we need something for --disable-libada and hope for the best.
-@@ -1838,7 +1838,7 @@ ADA_INCLUDE_SRCS =\
+@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
+ # Link flags used to build gnat tools. By default we prefer to statically
+ # link with libgcc to avoid a dependency on shared libgcc (which is tricky
+ # to deal with as it may conflict with the libgcc provided by the system).
+-GCC_LINK_FLAGS=-static-libgcc
++GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET)
- LIBGNAT=../$(RTSDIR)/libgnat.a
+ # End of variables for you to override.
--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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
