diff options
| author | sbd <sbd@pkgsrc.org> | 2012-01-17 20:43:25 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-01-17 20:43:25 +0000 |
| commit | 7af8c0456731949d45aafb85a1219fdec9b0ab05 (patch) | |
| tree | 74cd2d6ef07e9b34c588577547bdc8b3f3648d53 /mk | |
| parent | a62b1a5680e714bb48f0c4b8f4e9cb6d0c2bdebf (diff) | |
| download | pkgsrc-7af8c0456731949d45aafb85a1219fdec9b0ab05.tar.gz | |
Simplfy the MACHINE_ARCH/LOWER_ARCH settings on Linux.
1) Set LOWER_ARCH to the filtered uname -m output.
2) Set MACHINE_ARCH to LOWER_ARCH.
3) Brace LOWER_ARCH in a !defined block add it to MAKEFLAGS.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index ac4d3b0a64e..67779f0706c 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.319 2011/11/28 00:00:49 jmcneill Exp $ +# $NetBSD: bsd.prefs.mk,v 1.320 2012/01/17 20:43:25 sbd Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -216,18 +216,11 @@ LOWER_VENDOR?= sgi .elif ${OPSYS} == "Linux" OS_VERSION:= ${OS_VERSION:C/-.*$//} LOWER_OPSYS?= linux -MACHINE_ARCH:= ${MACHINE_ARCH:C/i.86/i386/} -MACHINE_ARCH:= ${MACHINE_ARCH:C/ppc/powerpc/} . if !defined(LOWER_ARCH) LOWER_ARCH!= ${UNAME} -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/' . endif # !defined(LOWER_ARCH) -. if ${LOWER_ARCH} == "x86_64" -MACHINE_ARCH= x86_64 -. endif -. if ${MACHINE_ARCH} == "unknown" || ${MACHINE_ARCH} == "" MACHINE_ARCH= ${LOWER_ARCH} MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q} -. endif . if exists(/etc/debian_version) LOWER_VENDOR?= debian . elif exists(/etc/mandrake-release) |