diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2011-11-11 12:26:55 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2011-11-11 12:26:55 +0000 |
| commit | 4f7b859b9b3145d39035ec279d51b342c904e88b (patch) | |
| tree | b35567d0d99b56a5ee9bd3302767b6b040686aef /Makefile.cross | |
| parent | 453992533afce78cfc3d9d5783b49645d1415ad3 (diff) | |
Allow 64bit -> arm cross compilation as it appears safe (amd64 -> arm at least)
include bsd.own.mk to get the correct compiler architectures
(if only Makefile.cross is used)
Diffstat (limited to 'Makefile.cross')
| -rw-r--r-- | Makefile.cross | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.cross b/Makefile.cross index f0ea1f9b94b..32afb7273e1 100644 --- a/Makefile.cross +++ b/Makefile.cross @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.48 2011/09/23 08:09:20 guenther Exp $ +# $OpenBSD: Makefile.cross,v 1.49 2011/11/11 12:26:54 drahn Exp $ cross-tools: cross-includes cross-binutils cross-gcc cross-lib cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var @@ -87,8 +87,8 @@ CROSSBINUTILS= ${CROSSDIR}/.binutils_done CROSSGCC= ${CROSSDIR}/.gcc_done #NO_CROSS= isakmpd keynote ssh -GCC2_ARCH=m68k m88k sparc vax -GCC4_ARCH=amd64 hppa hppa64 i386 ia64 mips64* powerpc sparc64 +.include <bsd.own.mk> + BINUTILS217_ARCH=hppa64 ia64 OLD_BINUTILS_ARCH=m68k m88k vax @@ -149,7 +149,9 @@ cross-env: BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${CROSSDIRS}: -.if ${TARGET_IS_LP64} != ${MACHINE_IS_LP64} +.if ${TARGET_ARCH} == "arm" && ${MACHINE_IS_LP64} == "yes" + # this config is allowed +.elif ${TARGET_IS_LP64} != ${MACHINE_IS_LP64} @echo "host and target have different size longs" @echo "cross compiler generates bad code; aborting"; exit 1 .endif |