d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Map foreign architecture names to FreeBSD naming convention.

Browse Source 
Approved by:	kib (mentor)
This commit is contained in:
Robert Millan 2012-01-20 18:55:56 +00:00
parent 618abe8ba1
commit 475cc570f4
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.bin/make/main.c
View File

@ -146,6 +146,14 @@ uint32_t warn_nocmd; /* command line no-warning flags */
time_t now; /* Time at start of make */
struct GNode *DEFAULT; /* .DEFAULT node */
static struct {
const char *foreign_name;
const char *freebsd_name;
} arch_aliases[] = {
{ "x86_64", "amd64" },
{ "mipsel", "mips" },
};
/**
* Exit with usage message.
*/
@ -939,10 +947,19 @@ main(int argc, char **argv)
*/
if ((machine = getenv("MACHINE")) == NULL) {
static struct utsname utsname;
unsigned int i;
if (uname(&utsname) == -1)
err(2, "uname");
machine = utsname.machine;
/* Canonicalize non-FreeBSD naming conventions */
for (i = 0; i < sizeof(arch_aliases)
/ sizeof(arch_aliases[0]); i++)
if (!strcmp(machine, arch_aliases[i].foreign_name)) {
machine = arch_aliases[i].freebsd_name;
break;
}
}
if ((machine_arch = getenv("MACHINE_ARCH")) == NULL) {