diff options
-rw-r--r-- | mk/bsd.prefs.mk | 21 | ||||
-rw-r--r-- | mk/configure/gnu-configure.mk | 5 | ||||
-rw-r--r-- | mk/defaults/mk.conf | 7 |
3 files changed, 24 insertions, 9 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 722046ed736..0b7eb62f03c 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.259 2007/08/01 12:21:56 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.260 2007/08/01 16:14:17 joerg Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -88,7 +88,8 @@ GNU_ARCH.m68000?= m68010 GNU_ARCH.mips?= mipsel GNU_ARCH.sh3eb?= sh GNU_ARCH.sh3el?= shle -MACHINE_GNU_ARCH?= ${GNU_ARCH.${MACHINE_ARCH}:U${MACHINE_ARCH}} +NATIVE_MACHINE_GNU_ARCH?= ${GNU_ARCH.${NATIVE_MACHINE_ARCH}:U${NATIVE_MACHINE_ARCH}} +MACHINE_GNU_ARCH?= ${GNU_ARCH.${MACHINE_ARCH}:U${MACHINE_ARCH}} .if ${OPSYS} == "NetBSD" LOWER_OPSYS?= netbsd @@ -232,11 +233,17 @@ OS_VERSION:= ${OS_VERSION} MAKEFLAGS+= LOWER_OPSYS=${LOWER_OPSYS:Q} -LOWER_VENDOR?= # empty ("arch--opsys") -LOWER_ARCH?= ${MACHINE_GNU_ARCH} - -MACHINE_PLATFORM?= ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH} -MACHINE_GNU_PLATFORM?= ${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX} +LOWER_VENDOR?= # empty ("arch--opsys") +LOWER_ARCH?= ${MACHINE_GNU_ARCH} +# Expand now as MACHINE_ARCH can be overriden in mk.conf and +# LOWER_ARCH is typically derived from it. +NATIVE_LOWER_ARCH:= ${LOWER_ARCH} +NATIVE_MACHINE_ARCH:= ${MACHINE_ARCH} + +NATIVE_MACHINE_PLATFORM?= ${OPSYS}-${OS_VERSION}-${NATIVE_MACHINE_ARCH} +MACHINE_PLATFORM?= ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH} +NATIVE_MACHINE_GNU_PLATFORM?= ${NATIVE_LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX} +MACHINE_GNU_PLATFORM?= ${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX} # Needed to prevent an "install:" target from being created in bsd.own.mk. NEED_OWN_INSTALL_TARGET=no diff --git a/mk/configure/gnu-configure.mk b/mk/configure/gnu-configure.mk index 7962d035b6f..0853673e090 100644 --- a/mk/configure/gnu-configure.mk +++ b/mk/configure/gnu-configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: gnu-configure.mk,v 1.5 2007/07/12 18:59:15 jlam Exp $ +# $NetBSD: gnu-configure.mk,v 1.6 2007/08/01 16:14:17 joerg Exp $ _VARGROUPS+= gnu-configure _USER_VARS.gnu-configure= # none @@ -25,6 +25,9 @@ CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX:Q} USE_GNU_CONFIGURE_HOST?= yes .if !empty(USE_GNU_CONFIGURE_HOST:M[yY][eE][sS]) +. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +CONFIGURE_ARGS+= --build=${NATIVE_MACHINE_GNU_PLATFORM:Q} +. endif CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} .endif diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 2f15081f185..d4f9320e988 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.156 2007/07/14 17:17:45 adrianp Exp $ +# $NetBSD: mk.conf,v 1.157 2007/08/01 16:14:17 joerg Exp $ # # This file provides default values for variables that may be overridden @@ -1732,6 +1732,11 @@ UNPRIVILEGED?= NO # Possible: YES, NO # Default: NO +USE_CROSS_COMPILE?= NO +# Set this to YES to enable cross-compiling support. +# Possible: YES, NO +# Default: NO + USE_CRYPTO?= YES # Used in speakfreely to choose support for encrypted connections. # Possible: YES, or NO. |