From 20c96b2a12375679431b9c324259986922d3e577 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 25 Aug 1999 18:37:05 +0000 Subject: [PATCH] * jvspec.c (lang_specific_driver): Correctly handle --help again. From-SVN: r28869 --- gcc/java/ChangeLog | 4 ++++ gcc/java/jvspec.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a752ff54acd..d30c891a600 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +1999-08-25 Tom Tromey + + * jvspec.c (lang_specific_driver): Correctly handle --help again. + 1999-08-25 Kaveh R. Ghazi * gjavah.c (print_name, print_base_classname, utf8_cmp, diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c index 9600bc2ba75..81b2b5284d9 100644 --- a/gcc/java/jvspec.c +++ b/gcc/java/jvspec.c @@ -190,6 +190,9 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries) /* Non-zero if linking is supposed to happen. */ int will_link = 1; + /* Non-zero if we want to find the spec file. */ + int want_spec_file = 1; + /* The argument we use to specify the spec file. */ char *spec_file = NULL; @@ -228,7 +231,7 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries) added--; } else if (strcmp (argv[i], "-fhelp") == 0) - will_link = 0; + want_spec_file = 0; else if (strcmp (argv[i], "-v") == 0) { saw_verbose_flag = 1; @@ -244,6 +247,7 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries) else if (strcmp (argv[i], "-C") == 0) { saw_C = 1; + want_spec_file = 0; #if COMBINE_INPUTS combine_inputs = 1; #endif @@ -459,7 +463,7 @@ lang_specific_driver (fn, in_argc, in_argv, in_added_libraries) /* Read the specs file corresponding to libgcj. If we didn't find the spec file on the -L path, then we hope it is somewhere in the standard install areas. */ - if (! saw_C) + if (want_spec_file) arglist[j++] = spec_file == NULL ? "-specs=libgcj.spec" : spec_file; if (saw_C) -- 2.30.2