diff options
| author | sevan <sevan> | 2015-11-07 19:53:49 +0000 |
|---|---|---|
| committer | sevan <sevan> | 2015-11-07 19:53:49 +0000 |
| commit | d38a7e3a5ded3b5e442081c9aa4d2e35f32683ae (patch) | |
| tree | 9849f18a01b9b6b4211a401f90d55a226590662c /mk | |
| parent | 53e190a4cbbca67840cfbf2437d6356e49fcc3d6 (diff) | |
| download | pkgsrc-d38a7e3a5ded3b5e442081c9aa4d2e35f32683ae.tar.gz | |
Add the necessary logic for setting Bitrig/amd64 to Bitrig/x86_64.
Switch to using arch(1) to populate $LOWER_ARCH on Bitrig
Reviewed by wiz@
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 8f42198f44f..82a44c781eb 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.371 2015/11/07 13:35:44 sevan Exp $ +# $NetBSD: bsd.prefs.mk,v 1.372 2015/11/07 19:53:49 sevan Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -150,9 +150,14 @@ LOWER_OPSYS?= bsdi .elif ${OPSYS} == "Bitrig" LOWER_OPSYS?= bitrig -LOWER_ARCH!= ${UNAME} -p +LOWER_ARCH!= arch -s +. if ${LOWER_ARCH} == "amd64" +MACHINE_ARCH= x86_64 +. else MACHINE_ARCH= ${LOWER_ARCH} +. endif MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q} +MAKEFLAGS+= MACHINE_ARCH=${MACHINE_ARCH:Q} LOWER_VENDOR?= unknown .elif ${OPSYS} == "Cygwin" |