mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
GFortran 4.6: Add patch to fix the output of `-v'.
svn path=/nixpkgs/trunk/; revision=33154
This commit is contained in:
parent
a3b099d279
commit
cc6f814a8f
2 changed files with 21 additions and 0 deletions
|
@ -54,6 +54,7 @@ let version = "4.6.3";
|
|||
# target libraries and tools.
|
||||
++ optional langAda ./gnat-cflags.patch
|
||||
++ optional langVhdl ./ghdl-ortho-cflags.patch
|
||||
++ optional langFortran ./gfortran-driving.patch
|
||||
++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch;
|
||||
|
||||
javaEcj = fetchurl {
|
||||
|
|
20
pkgs/development/compilers/gcc/4.6/gfortran-driving.patch
Normal file
20
pkgs/development/compilers/gcc/4.6/gfortran-driving.patch
Normal file
|
@ -0,0 +1,20 @@
|
|||
This patch fixes interaction with Libtool.
|
||||
See <http://thread.gmane.org/gmane.comp.gcc.patches/258777>, for details.
|
||||
|
||||
--- a/gcc/fortran/gfortranspec.c
|
||||
+++ b/gcc/fortran/gfortranspec.c
|
||||
@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n"));
|
||||
{
|
||||
fprintf (stderr, _("Driving:"));
|
||||
for (i = 0; i < g77_newargc; i++)
|
||||
+ {
|
||||
+ if (g77_new_decoded_options[i].opt_index == OPT_l)
|
||||
+ /* Make sure no white space is inserted after `-l'. */
|
||||
+ fprintf (stderr, " -l%s",
|
||||
+ g77_new_decoded_options[i].canonical_option[1]);
|
||||
+ else
|
||||
fprintf (stderr, " %s",
|
||||
g77_new_decoded_options[i].orig_option_with_args_text);
|
||||
+ }
|
||||
fprintf (stderr, "\n");
|
||||
}
|
Loading…
Reference in a new issue