diff options
| author | grant <grant> | 2003-04-21 01:35:10 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-04-21 01:35:10 +0000 |
| commit | 16871b9ec644616f4d685e34fd5bf1c496c5894c (patch) | |
| tree | 997890e0bffcb2499e78750d7c00e3246d084401 /mk/bsd.prefs.mk | |
| parent | efa8a6fdb14804aff86a0f19af465ed4fe7878f7 (diff) | |
| download | pkgsrc-16871b9ec644616f4d685e34fd5bf1c496c5894c.tar.gz | |
ensure LOWER_ARCH always gets set on Solaris, not only if MACHINE_ARCH
is non-sensical. shuffle some definitions around to follow style of
other entries.
semi-related to a tr(1) bug observed by sommerfeld@ Solaris 10/i386.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 2a674f88e9d..0ce12653ede 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.110 2003/04/15 05:29:46 grant Exp $ +# $NetBSD: bsd.prefs.mk,v 1.111 2003/04/21 01:35:10 grant Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -70,6 +70,9 @@ LOWER_VENDOR?= unknown . endif .elif ${OPSYS} == "SunOS" +LOWER_OPSYS?= solaris +LOWER_ARCH!= ${UNAME} -p +MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH} . if ${MACHINE_ARCH} == "sparc" SPARC_TARGET_ARCH?= sparcv7 . elif ${MACHINE_ARCH} == "sun4" @@ -77,14 +80,8 @@ MACHINE_ARCH= sparc SPARC_TARGET_ARCH?= sparcv7 . elif ${MACHINE_ARCH} == "i86pc" MACHINE_ARCH= i386 -. elif ${MACHINE_ARCH} == "unknown" -. if !defined(LOWER_ARCH) -LOWER_ARCH!= ${UNAME} -p -. endif # !defined(LOWER_ARCH) -MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH} . endif LOWER_VENDOR?= sun -LOWER_OPSYS?= solaris .elif ${OPSYS} == "Linux" LOWER_OPSYS?= linux |