[BACK]Return to main.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/main.c between version 1.10 and 1.11

version 1.10, 1997/01/15 23:42:51 version 1.11, 1997/01/27 05:24:09
Line 490 
Line 490 
          * so we can share an executable for similar machines.           * so we can share an executable for similar machines.
          * (i.e. m68k: amiga hp300, mac68k, sun3, ...)           * (i.e. m68k: amiga hp300, mac68k, sun3, ...)
          *           *
          * Note that while MACHINE is decided at run-time,           * Note that both MACHINE and MACHINE_ARCH can be overridden
          * MACHINE_ARCH is always known at compile time.           * by environment variables.  MACHINE through the getenv()
            * above and MACHINE_ARCH, below.
          */           */
         if (!machine) {          if (!machine) {
 #ifndef MACHINE  #ifndef MACHINE
Line 599 
Line 600 
         Var_Set("MFLAGS", "", VAR_GLOBAL);          Var_Set("MFLAGS", "", VAR_GLOBAL);
         Var_Set("MACHINE", machine, VAR_GLOBAL);          Var_Set("MACHINE", machine, VAR_GLOBAL);
 #ifdef MACHINE_ARCH  #ifdef MACHINE_ARCH
         Var_Set("MACHINE_ARCH", MACHINE_ARCH, VAR_GLOBAL);          if (NULL == getenv("MACHINE_ARCH")) {
                   Var_Set("MACHINE_ARCH", MACHINE_ARCH, VAR_GLOBAL);
           }
 #endif  #endif
   
         /*          /*
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11