[release-branch.r57] 5a, 6a, 8a, cc: remove old environment variables

««« CL 4445079 / f8cc81f985e5
5a, 6a, 8a, cc: remove old environment variables

Uses of $INCLUDE and $NPROC are left over from Plan 9.
Remove them to avoid causing confusion.

R=golang-dev, r2
CC=golang-dev
https://golang.org/cl/4445079
»»»

TBR=adg
CC=golang-dev
https://golang.org/cl/4438096

diff --git a/src/cmd/5a/lex.c b/src/cmd/5a/lex.c
index dbee3657f1aa4e4ba7ce7e92bc4770fb62a0e9ce..a04cda2201aeda13baee478a94bb4175dcb74b05 100644 (file)
--- a/src/cmd/5a/lex.c
+++ b/src/cmd/5a/lex.c
@@ -50,7 +50,7 @@ void
 main(int argc, char *argv[])
 {
        char *p;
-       int nout, nproc, i, c;
+       int c;
 
        thechar = '5';
        thestring = "arm";
@@ -94,46 +94,10 @@ main(int argc, char *argv[])
                print("usage: %ca [-options] file.s\n", thechar);
                errorexit();
        }
-       if(argc > 1 && systemtype(Windows)){
-               print("can't assemble multiple files on windows\n");
+       if(argc > 1){
+               print("can't assemble multiple files\n");
                errorexit();
        }
-       if(argc > 1 && !systemtype(Windows)) {
-               nproc = 1;
-               if(p = getenv("NPROC"))
-                       nproc = atol(p);        /* */
-               c = 0;
-               nout = 0;
-               for(;;) {
-                       Waitmsg *w;
-
-                       while(nout < nproc && argc > 0) {
-                               i = fork();
-                               if(i < 0) {
-                                       fprint(2, "fork: %r\n");
-                                       errorexit();
-                               }
-                               if(i == 0) {
-                                       print("%s:\n", *argv);
-                                       if(assemble(*argv))
-                                               errorexit();
-                                       exits(0);
-                               }
-                               nout++;
-                               argc--;
-                               argv++;
-                       }
-                       w = wait();
-                       if(w == nil) {
-                               if(c)
-                                       errorexit();
-                               exits(0);
-                       }
-                       if(w->msg[0])
-                               c++;
-                       nout--;
-               }
-       }
        if(assemble(argv[0]))
                errorexit();
        exits(0);
@@ -142,7 +106,7 @@ main(int argc, char *argv[])
 int
 assemble(char *file)
 {
-       char *ofile, incfile[20], *p;
+       char *ofile, *p;
        int i, of;
 
        ofile = alloc(strlen(file)+3); // +3 for .x\0 (x=thechar)
@@ -167,15 +131,6 @@ assemble(char *file)
                } else
                        outfile = "/dev/null";
        }
-       p = getenv("INCLUDE");
-       if(p) {
-               setinclude(p);
-       } else {
-               if(systemtype(Plan9)) {
-                       sprint(incfile,"/%s/include", thestring);
-                       setinclude(strdup(incfile));
-               }
-       }
 
        of = create(outfile, OWRITE, 0664);
        if(of < 0) {

diff --git a/src/cmd/6a/lex.c b/src/cmd/6a/lex.c
index 37144c8884956f66075ece16d7b95dfe4eb99007..b4c7d0c2cbf6a2b2d78cadb492dd7237ce3fdc1b 100644 (file)
--- a/src/cmd/6a/lex.c
+++ b/src/cmd/6a/lex.c
@@ -56,7 +56,7 @@ void
 main(int argc, char *argv[])
 {
        char *p;
-       int nout, nproc, i, c;
+       int c;
 
        thechar = '6';
        thestring = "amd64";
@@ -96,46 +96,10 @@ main(int argc, char *argv[])
                print("usage: %ca [-options] file.s\n", thechar);
                errorexit();
        }
-       if(argc > 1 && systemtype(Windows)){
-               print("can't assemble multiple files on windows\n");
+       if(argc > 1){
+               print("can't assemble multiple files\n");
                errorexit();
        }
-       if(argc > 1 && !systemtype(Windows)) {
-               nproc = 1;
-               if(p = getenv("NPROC"))
-                       nproc = atol(p);        /* */
-               c = 0;
-               nout = 0;
-               for(;;) {
-                       Waitmsg *w;
-
-                       while(nout < nproc && argc > 0) {
-                               i = fork();
-                               if(i < 0) {
-                                       fprint(2, "fork: %r\n");
-                                       errorexit();
-                               }
-                               if(i == 0) {
-                                       print("%s:\n", *argv);
-                                       if(assemble(*argv))
-                                               errorexit();
-                                       exits(0);
-                               }
-                               nout++;
-                               argc--;
-                               argv++;
-                       }
-                       w = wait();
-                       if(w == nil) {
-                               if(c)
-                                       errorexit();
-                               exits(0);
-                       }
-                       if(w->msg[0])
-                               c++;
-                       nout--;
-               }
-       }
        if(assemble(argv[0]))
                errorexit();
        exits(0);
@@ -144,7 +108,7 @@ main(int argc, char *argv[])
 int
 assemble(char *file)
 {
-       char *ofile, incfile[20], *p;
+       char *ofile, *p;
        int i, of;
 
        ofile = alloc(strlen(file)+3); // +3 for .x\0 (x=thechar)
@@ -169,15 +133,6 @@ assemble(char *file)
                } else
                        outfile = "/dev/null";
        }
-       p = getenv("INCLUDE");
-       if(p) {
-               setinclude(p);
-       } else {
-               if(systemtype(Plan9)) {
-                       sprint(incfile,"/%s/include", thestring);
-                       setinclude(strdup(incfile));
-               }
-       }
 
        of = create(outfile, OWRITE, 0664);
        if(of < 0) {

diff --git a/src/cmd/8a/lex.c b/src/cmd/8a/lex.c
index ca18b69ce673f3f05a589133f2f9d264feb1f710..0788618777f385b77846368f7ef8b341c0e2b883 100644 (file)
--- a/src/cmd/8a/lex.c
+++ b/src/cmd/8a/lex.c
@@ -56,7 +56,7 @@ void
 main(int argc, char *argv[])
 {
        char *p;
-       int nout, nproc, i, c;
+       int c;
 
        thechar = '8';
        thestring = "386";
@@ -96,46 +96,10 @@ main(int argc, char *argv[])
                print("usage: %ca [-options] file.s\n", thechar);
                errorexit();
        }
-       if(argc > 1 && systemtype(Windows)){
-               print("can't assemble multiple files on windows\n");
+       if(argc > 1){
+               print("can't assemble multiple files\n");
                errorexit();
        }
-       if(argc > 1 && !systemtype(Windows)) {
-               nproc = 1;
-               if(p = getenv("NPROC"))
-                       nproc = atol(p);        /* */
-               c = 0;
-               nout = 0;
-               for(;;) {
-                       Waitmsg *w;
-
-                       while(nout < nproc && argc > 0) {
-                               i = fork();
-                               if(i < 0) {
-                                       fprint(2, "fork: %r\n");
-                                       errorexit();
-                               }
-                               if(i == 0) {
-                                       print("%s:\n", *argv);
-                                       if(assemble(*argv))
-                                               errorexit();
-                                       exits(0);
-                               }
-                               nout++;
-                               argc--;
-                               argv++;
-                       }
-                       w = wait();
-                       if(w == nil) {
-                               if(c)
-                                       errorexit();
-                               exits(0);
-                       }
-                       if(w->msg[0])
-                               c++;
-                       nout--;
-               }
-       }
        if(assemble(argv[0]))
                errorexit();
        exits(0);
@@ -144,7 +108,7 @@ main(int argc, char *argv[])
 int
 assemble(char *file)
 {
-       char *ofile, incfile[20], *p;
+       char *ofile, *p;
        int i, of;
 
        ofile = alloc(strlen(file)+3); // +3 for .x\0 (x=thechar)
@@ -169,15 +133,6 @@ assemble(char *file)
                } else
                        outfile = "/dev/null";
        }
-       p = getenv("INCLUDE");
-       if(p) {
-               setinclude(p);
-       } else {
-               if(systemtype(Plan9)) {
-                       sprint(incfile,"/%s/include", thestring);
-                       setinclude(strdup(incfile));
-               }
-       }
 
        of = create(outfile, OWRITE, 0664);
        if(of < 0) {

diff --git a/src/cmd/cc/lex.c b/src/cmd/cc/lex.c
index dba8ff6340b2005894160e5f6d8a24b808a5ab5c..71cc89bf0d60ed6b0ace26f5e5d5dc119aaedb7b 100644 (file)
--- a/src/cmd/cc/lex.c
+++ b/src/cmd/cc/lex.c
@@ -88,7 +88,7 @@ void
 main(int argc, char *argv[])
 {
        char **defs, *p;
-       int nproc, nout, i, c, ndef;
+       int c, ndef;
 
        ensuresymb(NSYMB);
        memset(debug, 0, sizeof(debug));
@@ -142,51 +142,10 @@ main(int argc, char *argv[])
                print("usage: %cc [-options] files\n", thechar);
                errorexit();
        }
-       if(argc > 1 && systemtype(Windows)){
-               print("can't compile multiple files on windows\n");
+       if(argc > 1){
+               print("can't compile multiple files\n");
                errorexit();
        }
-       if(argc > 1 && !systemtype(Windows)) {
-               nproc = 1;
-               /*
-                * if we're writing acid to standard output, don't compile
-                * concurrently, to avoid interleaving output.
-                */
-               if(((!debug['a'] && !debug['q'] && !debug['Q']) || debug['n']) &&
-                   (p = getenv("NPROC")) != nil)
-                       nproc = atol(p);        /* */
-               c = 0;
-               nout = 0;
-               for(;;) {
-                       Waitmsg *w;
-
-                       while(nout < nproc && argc > 0) {
-                               i = fork();
-                               if(i < 0) {
-                                       print("cannot create a process\n");
-                                       errorexit();
-                               }
-                               if(i == 0) {
-                                       fprint(2, "%s:\n", *argv);
-                                       if (compile(*argv, defs, ndef))
-                                               errorexit();
-                                       exits(0);
-                               }
-                               nout++;
-                               argc--;
-                               argv++;
-                       }
-                       w = wait();
-                       if(w == nil) {
-                               if(c)
-                                       errorexit();
-                               exits(0);
-                       }
-                       if(w->msg[0])
-                               c++;
-                       nout--;
-               }
-       }
 
        if(argc == 0)
                c = compile("stdin", defs, ndef);
@@ -201,7 +160,7 @@ main(int argc, char *argv[])
 int
 compile(char *file, char **defs, int ndef)
 {
-       char *ofile, incfile[20];
+       char *ofile;
        char *p, **av, opt[256];
        int i, c, fd[2];
        static int first = 1;
@@ -236,15 +195,6 @@ compile(char *file, char **defs, int ndef)
                        outfile = "/dev/null";
        }
 
-       if(p = getenv("INCLUDE")) {
-               setinclude(p);
-       } else {
-               if(systemtype(Plan9)) {
-                       sprint(incfile, "/%s/include", thestring);
-                       setinclude(strdup(incfile));
-                       setinclude("/sys/include");
-               }
-       }
        if (first)
                Binit(&diagbuf, 1, OWRITE);
        /*