src/usr.bin/make/main.c - diff

Return to main.c CVS log

Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/main.c between version 1.92 and 1.93

version 1.92, 2008/11/04 07:22:35

version 1.93, 2010/02/03 20:45:44

Line 109

static char *figure_out_MACHINE(void);

static char *figure_out_MACHINE_ARCH(void);

static char *figure_out_MACHINE_CPU(void);

static void no_fd_limits(void);

static char *chdir_verify_path(const char *, struct dirs *);

Line 406

Line 407

* Get the name of this type of MACHINE from utsname so we can share an

* executable for similar machines. (i.e. m68k: amiga hp300, mac68k, sun3, ...)

* Note that both MACHINE and MACHINE_ARCH are decided at

* Note that MACHINE, MACHINE_ARCH and MACHINE_CPU are decided at

* run-time.

static char *

Line 442

Line 443

}

return r;

}

static char *

figure_out_MACHINE_CPU()

{

char *r = getenv("MACHINE_CPU");

if (r == NULL) {

#if !defined(MACHINE_CPU) && ! defined(MACHINE_ARCH)

r = "unknown"; /* XXX: no uname -p yet */

#else

#if defined(MACHINE_CPU)

r = MACHINE_CPU;

#else

r = MACHINE_ARCH;

#endif

}

return r;

}

/* get rid of resource limit on file descriptors */

static void

Line 653

Line 671

bool outOfDate = true; /* false if all targets up to date */

char *machine = figure_out_MACHINE();

char *machine_arch = figure_out_MACHINE_ARCH();

char *machine_cpu = figure_out_MACHINE_CPU();

const char *syspath = _PATH_DEFSYSPATH;

char *p;

static struct dirs d;

Line 706

Line 725

Var_Set("MFLAGS", "");

Var_Set("MACHINE", machine);

Var_Set("MACHINE_ARCH", machine_arch);

Var_Set("MACHINE_CPU", machine_cpu);

* First snag any flags out of the MAKEFLAGS environment variable.