Commit 52dfc05b by Michael Matz Committed by Michael Matz

gfortranspec.c (library): New global, moved from ...

	* gfortranspec.c (library): New global, moved from ...
	(lang_specific_driver): ... here.
	(lang_specific_pre_link): Test it here before including
	libgfortran.spec.

From-SVN: r167027
parent 3e52c27b
2010-11-22 Michael Matz <matz@suse.de>
* gfortranspec.c (library): New global, moved from ...
(lang_specific_driver): ... here.
(lang_specific_pre_link): Test it here before including
libgfortran.spec.
2010-11-21 Michael Matz <matz@suse.de> 2010-11-21 Michael Matz <matz@suse.de>
Tobias Burnus <burnus@net-b.de> Tobias Burnus <burnus@net-b.de>
......
...@@ -76,7 +76,11 @@ static unsigned int g77_newargc; ...@@ -76,7 +76,11 @@ static unsigned int g77_newargc;
static struct cl_decoded_option *g77_new_decoded_options; static struct cl_decoded_option *g77_new_decoded_options;
/* The path to the spec file. */ /* The path to the spec file. */
char *spec_file = NULL; static char *spec_file = NULL;
/* This will be NULL if we encounter a situation where we should not
link in the fortran libraries. */
static const char *library = NULL;
/* Return full path name of spec file if it is in DIR, or NULL if /* Return full path name of spec file if it is in DIR, or NULL if
...@@ -207,10 +211,6 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, ...@@ -207,10 +211,6 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
unsigned int i; unsigned int i;
int verbose = 0; int verbose = 0;
/* This will be NULL if we encounter a situation where we should not
link in libf2c. */
const char *library = FORTRAN_LIBRARY;
/* 0 => -xnone in effect. /* 0 => -xnone in effect.
1 => -xfoo in effect. */ 1 => -xfoo in effect. */
int saw_speclang = 0; int saw_speclang = 0;
...@@ -233,6 +233,8 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, ...@@ -233,6 +233,8 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
int n_infiles = 0; int n_infiles = 0;
int n_outfiles = 0; int n_outfiles = 0;
library = FORTRAN_LIBRARY;
#if 0 #if 0
fprintf (stderr, "Incoming:"); fprintf (stderr, "Incoming:");
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
...@@ -472,7 +474,7 @@ lang_specific_pre_link (void) ...@@ -472,7 +474,7 @@ lang_specific_pre_link (void)
{ {
if (spec_file) if (spec_file)
free (spec_file); free (spec_file);
else else if (library)
do_spec ("%:include(libgfortran.spec)"); do_spec ("%:include(libgfortran.spec)");
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment