svn commit: r215257 - head

Warner Losh imp at FreeBSD.org
Sat Nov 13 20:41:47 UTC 2010


Author: imp
Date: Sat Nov 13 20:41:47 2010
New Revision: 215257
URL: http://svn.freebsd.org/changeset/base/215257

Log:
  The fixes for mips/mips arm/arm compat hacks broke if TARGET or
  TARGET_ARCH wasn't defined.  Fix it for that case.
  
  Submitted by:	Garrett Cooper

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Nov 13 20:30:24 2010	(r215256)
+++ head/Makefile.inc1	Sat Nov 13 20:41:47 2010	(r215257)
@@ -124,7 +124,8 @@ TARGET_ARCH=	${TARGET:S/pc98/i386/:S/sun
 TARGET=		${TARGET_ARCH:C/mipse[lb]/mips/:C/armeb/arm}
 .endif
 # Legacy names, for a transition period mips:mips -> mipsel:mips
-.if ${TARGET_ARCH} == "mips" && ${TARGET} == "mips"
+.if defined(TARGET) && defined(TARGET_ARCH) && \
+    ${TARGET_ARCH} == "mips" && ${TARGET} == "mips"
 .warning "TARGET_ARCH of mips is deprecated in favor of mipsel or mipseb"
 .if defined(TARGET_BIG_ENDIAN)
 TARGET_ARCH=mipseb
@@ -133,7 +134,7 @@ TARGET_ARCH=mipsel
 .endif
 .endif
 # arm with TARGET_BIG_ENDIAN -> armeb
-.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+.if defined(TARGET_ARCH) && ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
 .warning "TARGET_ARCH of arm with TARGET_BIG_ENDIAN is deprecated.  use armeb"
 TARGET_ARCH=armeb
 .endif


More information about the svn-src-head mailing list