diff --git a/driver/build_string.c b/driver/build_string.c index a719ac861..68eee3a1f 100644 --- a/driver/build_string.c +++ b/driver/build_string.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: build_string.c,v 1.13 2003/09/23 05:57:15 steve Exp $" +#ident "$Id: build_string.c,v 1.14 2003/11/01 04:21:57 steve Exp $" #endif # include "config.h" @@ -75,6 +75,12 @@ int build_string(char*output, size_t olen, const char*pattern) olen -= strlen(iconfig_path); break; + case 'c': + strcpy(output, iconfig_common_path); + output += strlen(iconfig_common_path); + olen -= strlen(iconfig_common_path); + break; + case 'f': if (f_list) { strcpy(output, f_list); @@ -112,6 +118,9 @@ int build_string(char*output, size_t olen, const char*pattern) /* * $Log: build_string.c,v $ + * Revision 1.14 2003/11/01 04:21:57 steve + * Add support for a target static config file. + * * Revision 1.13 2003/09/23 05:57:15 steve * Pass -m flag from driver via iconfig file. * diff --git a/driver/globals.h b/driver/globals.h index 506720bd3..d7e229893 100644 --- a/driver/globals.h +++ b/driver/globals.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: globals.h,v 1.16 2002/08/12 01:35:01 steve Exp $" +#ident "$Id: globals.h,v 1.17 2003/11/01 04:21:57 steve Exp $" #endif # include @@ -29,6 +29,7 @@ extern const char*base; /* This is the path to the iconfig file sent to ivl. */ extern char* iconfig_path; +extern char* iconfig_common_path; /* This is a list of all the -f= options from the command line, concatenated together. */ @@ -92,6 +93,9 @@ extern int build_string(char*out, size_t olen, const char*pattern); /* * $Log: globals.h,v $ + * Revision 1.17 2003/11/01 04:21:57 steve + * Add support for a target static config file. + * * Revision 1.16 2002/08/12 01:35:01 steve * conditional ident string using autoconfig. * diff --git a/driver/main.c b/driver/main.c index 77542ce06..d16f92d80 100644 --- a/driver/main.c +++ b/driver/main.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: main.c,v 1.57 2003/10/26 22:43:42 steve Exp $" +#ident "$Id: main.c,v 1.58 2003/11/01 04:21:57 steve Exp $" #endif # include "config.h" @@ -126,6 +126,9 @@ unsigned source_count = 0; char*iconfig_path = 0; FILE*iconfig_file = 0; +static char iconfig_common_path_buf[4096] = ""; +char*iconfig_common_path = iconfig_common_path_buf; + int synth_flag = 0; int verbose_flag = 0; int command_file = 0; @@ -568,6 +571,10 @@ int main(int argc, char **argv) return 0; } + /* Make a common conf file path to reflect the target. */ + sprintf(iconfig_common_path, "%s%c%s%s.conf", + base,sep, targ, synth_flag? "-s" : ""); + /* Write values to the iconfig file. */ if (mtm != 0) fprintf(iconfig_file, "-T:%s\n", mtm); fprintf(iconfig_file, "generation:%s\n", generation); @@ -708,6 +715,9 @@ int main(int argc, char **argv) /* * $Log: main.c,v $ + * Revision 1.58 2003/11/01 04:21:57 steve + * Add support for a target static config file. + * * Revision 1.57 2003/10/26 22:43:42 steve * Improve -V messages, * @@ -728,29 +738,5 @@ int main(int argc, char **argv) * * Revision 1.51 2003/02/22 04:12:49 steve * Add the portbind warning. - * - * Revision 1.50 2003/01/10 19:01:04 steve - * Only use libiberty.h if available. - * - * Revision 1.49 2002/12/04 03:26:59 steve - * Mingw32 compatible temp file management. - * - * Revision 1.48 2002/12/04 02:29:36 steve - * Use O_EXCL when opening temp files. - * - * Revision 1.47 2002/08/12 01:27:48 steve - * Escape the backslash in the windows file name. - * - * Revision 1.46 2002/08/10 22:36:59 steve - * No longer any nead for -rdynamic flag - * - * Revision 1.45 2002/08/10 22:27:13 steve - * Kill links to vvm. - * - * Revision 1.44 2002/07/15 00:33:50 steve - * Improve temporary file name guess. - * - * Revision 1.43 2002/07/14 23:32:31 steve - * No longer need the .exe on generated files. */