[Dotgnu-pnet-commits] CVS: pnet/cscc/common cc_options.c,1.12,1.13

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/cscc/common
In directory subversions:/tmp/cvs-serv8871/cscc/common

Modified Files:
        cc_options.c 
Log Message:


Bug in the "corlib.dll" detection logic.


Index: cc_options.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/common/cc_options.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** cc_options.c        27 Feb 2003 07:19:48 -0000      1.12
--- cc_options.c        28 Feb 2003 05:31:55 -0000      1.13
***************
*** 583,586 ****
--- 583,587 ----
        char *optname;
        char *value;
+       int outlen;
        mode &= ~(CMDLINE_PARSE_PLUGIN_NOSTDLIB | CMDLINE_PARSE_COMPAT);
  
***************
*** 862,867 ****
           "-lcorlib" is supplied on the command-line.  Needed for
           interoperability with Mono build scripts */
!       if(output_filename != 0 && strlen(output_filename) >= 10 &&
!          !ILStrICmp(output_filename + strlen(output_filename) - 10, 
"corlib.dll"))
        {
                AddString(&extension_flags, &num_extension_flags,
--- 863,871 ----
           "-lcorlib" is supplied on the command-line.  Needed for
           interoperability with Mono build scripts */
!       outlen = (output_filename ? strlen(output_filename) : 0);
!       if(output_filename != 0 && outlen >= 10 &&
!          !ILStrICmp(output_filename + outlen - 10, "corlib.dll") &&
!          (outlen == 10 || output_filename[outlen - 11] == '/' ||
!           output_filename[outlen - 11] == '\\'))
        {
                AddString(&extension_flags, &num_extension_flags,