[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.115 and 1.116

version 1.115, 2015/10/14 13:50:22 version 1.116, 2015/11/15 06:19:22
Line 38 
Line 38 
 #include <sys/param.h>  /* MACHINE MACHINE_ARCH */  #include <sys/param.h>  /* MACHINE MACHINE_ARCH */
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/stat.h>  #include <sys/stat.h>
 #ifndef MAKE_BOOTSTRAP  
 #include <sys/utsname.h>  #include <sys/utsname.h>
 #endif  
 #include <err.h>  #include <err.h>
 #include <errno.h>  #include <errno.h>
 #include <stdio.h>  #include <stdio.h>
Line 466 
Line 464 
 {  {
         char *r = getenv("MACHINE");          char *r = getenv("MACHINE");
         if (r == NULL) {          if (r == NULL) {
 #ifndef MAKE_BOOTSTRAP  
                 static struct utsname utsname;                  static struct utsname utsname;
   
                 if (uname(&utsname) == -1) {                  if (uname(&utsname) == -1) {
Line 474 
Line 471 
                         exit(2);                          exit(2);
                 }                  }
                 r = utsname.machine;                  r = utsname.machine;
 #else  
                 r = MACHINE;  
 #endif  
         }          }
         return r;          return r;
 }  }
Legend:
Removed from v.1.115  
changed lines
  Added in v.1.116