Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.135
 
1.136
 
MAIN:gmcgarry:20081222020411
 
cc.c
_>237237 #define STARTLABEL "__start"
 238238 #endif
 239239 char *incdir = STDINC;
<> 240+char *libdir = LIBDIR;
240241 char *pccincdir = PCCINCDIR;
 241242 char *pcclibdir = PCCLIBDIR;
 242243 
     
 !
278279 #ifdef WIN32
 279280         /* have to prefix path early.  -B may override */
 280281         incdir = win32pathsubst(incdir);
<> 282+        libdir = win32pathsubst(libdir);
281283         pccincdir = win32pathsubst(pccincdir);
 282284         pcclibdir = win32pathsubst(pcclibdir);
 283285         passp = win32pathsubst(passp);
     
 !
609611         }
 610612         if (Bflag) {
 611613                 incdir = Bflag;
<> 614+                libdir = Bflag;
612615                 pccincdir = Bflag;
 613616                 pcclibdir = Bflag;
 614617         }
     
 !
936939 #define DL      "-L"
 937940 #endif
 938941                         char *s = copy(DL, i = strlen(pcclibdir));
<>939 -                        strlcat(s, pcclibdir, sizeof(DL) +i );
  942+                        strlcat(s, pcclibdir, sizeof(DL) + i);
940943                         av[j++] = s;
<> 944+#ifdef os_win32
  945+                        s = copy(DL, i = strlen(libdir));
  946+                        strlcat(s, libdir, sizeof(DL) + i);
  947+                        av[j++] = s;
  948+#endif
941949                         if (pgflag) {
 942950                                 for (i = 0; libclibs_profile[i]; i++)
 943951                                         av[j++] = Bprefix(libclibs_profile[i]);
     
 !
10531061         char *str;
 10541062         int i;
 10551063 
<>1056 -        if (Bflag == NULL || s[0] != '/')
  1064+#ifdef os_win32
  1065+
  1066+        /*  put here to save sprinkling it ~everywhere  */
  1067+        s =  win32pathsubst(s);
  1068+
  1069+        if (Bflag == NULL)
10571070                 return s;
<> 1071+        suffix = strrchr(s, '/');
  1072+        if (suffix == NULL)
  1073+                suffix = strrchr(s, '\\');
10581074 
<> 1075+#else
  1076+
  1077+        if (Bflag == NULL || s[0] != '/')
  1078+                return s;
10591079         suffix = strrchr(s, '/');
<> 1080+
  1081+#endif
  1082+
10601083         if (suffix == NULL)
 10611084                 suffix = s;
 10621085 
     
 !
12771300         if (len <= 0)
 12781301                 return s;
 12791302 
<> 1303+        while (env[len-1] == '/' || env[len-1] == '\\' || env[len-1] == '\0')
  1304+                env[--len] = 0;
  1305+
<_12801306         len += 3;
 12811307         rv = ccmalloc(len);
 12821308         strlcpy(rv, "\"", len);
FishEye: Open Source License registered to PCC.
Your maintenance has expired. You can renew your license at http://www.atlassian.com/fisheye/renew
Atlassian FishEye, CVS analysis. (Version:1.6.3 Build:build-336 2008-11-04) - Administration - Page generated 2014-09-22 02:10 +0200