missed a few paths

SCCS-vsn: old/pcc/cc/cc.c 4.17
SCCS-vsn: old/pcc/cc/pathnames.h 5.2

diff --git a/usr/src/old/pcc/cc/cc.c b/usr/src/old/pcc/cc/cc.c
index a77f840..09a2246 100644 (file)
--- a/usr/src/old/pcc/cc/cc.c
+++ b/usr/src/old/pcc/cc/cc.c
@@ -1,4 +1,4 @@
-static char sccsid[] = "@(#)cc.c 4.16 %G%";
+static char sccsid[] = "@(#)cc.c 4.17 %G%";

 /*
  * cc - front end for C compiler
  */
 /*
  * cc - front end for C compiler
  */


@@ -73,9 +73,9 @@ main(argc, argv)
                        continue;
                case 'p':
                        proflag++;
                        continue;
                case 'p':
                        proflag++;

-                       crt0 = "/lib/mcrt0.o";
+                       crt0 = _PATH_MCRT0;

                        if (argv[i][2] == 'g')
                        if (argv[i][2] == 'g')

-                               crt0 = "/usr/lib/gcrt0.o";
+                               crt0 = _PATH_GCRT0;

                        continue;
                case 'f':
                        fflag++;
                        continue;
                case 'f':
                        fflag++;


@@ -157,7 +157,7 @@ main(argc, argv)
        if (npassname && chpass ==0)
                chpass = "012p";
        if (chpass && npassname==0)
        if (npassname && chpass ==0)
                chpass = "012p";
        if (chpass && npassname==0)

-               npassname = "/usr/new";
+               npassname = _PATH_USRNEW;

        if (chpass)
        for (t=chpass; *t; t++) {
                switch (*t) {
        if (chpass)
        for (t=chpass; *t; t++) {
                switch (*t) {

diff --git a/usr/src/old/pcc/cc/pathnames.h b/usr/src/old/pcc/cc/pathnames.h
index 092005d..479384c 100644 (file)
--- a/usr/src/old/pcc/cc/pathnames.h
+++ b/usr/src/old/pcc/cc/pathnames.h
@@ -14,13 +14,16 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)pathnames.h 5.1 (Berkeley) %G%
+ *     @(#)pathnames.h 5.2 (Berkeley) %G%

  */
 
  */
 

-#define        _PATH_AS        "/bin/as";
-#define        _PATH_C2        "/lib/c2";
-#define        _PATH_CCOM      "/lib/ccom";
-#define        _PATH_CPP       "/lib/cpp";
-#define        _PATH_CRT0      "/lib/crt0.o";
-#define        _PATH_LD        "/bin/ld";
-#define        _PATH_SCCOM     "/lib/sccom";
+#define        _PATH_AS        "/bin/as"
+#define        _PATH_C2        "/lib/c2"
+#define        _PATH_CCOM      "/lib/ccom"
+#define        _PATH_CPP       "/lib/cpp"
+#define        _PATH_CRT0      "/lib/crt0.o"
+#define        _PATH_GCRT0     "/usr/lib/gcrt0.o"
+#define        _PATH_LD        "/bin/ld"
+#define        _PATH_MCRT0     "/lib/mcrt0.o"
+#define        _PATH_SCCOM     "/lib/sccom"
+#define        _PATH_USRNEW    "/usr/new"