svn commit: r215351 - head/gnu/usr.bin/binutils

[Nathan Whitehorn]

Author: nwhitehorn
Date: Mon Nov 15 22:11:18 2010
New Revision: 215351
URL: http://svn.freebsd.org/changeset/base/215351

Log:
  Try including Makefile.${TARGET_ARCH} before Makefile.${TARGET_CPUARCH} if
  it exists in order to allow arch-specific overrides. This fixes the
  binutils (and world) build on powerpc64 after recent TBEMD merges.
  
  Reviewed by:	imp

Modified:
  head/gnu/usr.bin/binutils/Makefile.inc0

Modified: head/gnu/usr.bin/binutils/Makefile.inc0
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile.inc0	Mon Nov 15 22:05:08 2010	(r215350)
+++ head/gnu/usr.bin/binutils/Makefile.inc0	Mon Nov 15 22:11:18 2010	(r215351)
@@ -36,28 +36,15 @@ CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64
 .endif
 
 CFLAGS+= -I.
-.if exists(${.CURDIR}/${TARGET_CPUARCH})
-CFLAGS+= -I${.CURDIR}/${TARGET_CPUARCH}
-.endif
 CFLAGS+= -I${.CURDIR}
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd
 CFLAGS+= -I${.OBJDIR}/${RELTOP}/libbfd
 CFLAGS+= -I${SRCDIR}/include
 
-.if exists(${.CURDIR}/${TARGET_CPUARCH})
-.PATH: ${.CURDIR}/${TARGET_CPUARCH}
-.endif
-
 ARCHS=	${TARGET_CPUARCH}
 
-.for _arch in ${CROSS_ARCH}
-.if (${ARCHS:R:M${_arch:R}} == "")
-ARCHS+= $(_arch)
-.endif
-.endfor
-
-.for _arch in ${ARCHS}
-.if exists(${.CURDIR}/Makefile.${_arch})
-.include "${.CURDIR}/Makefile.${_arch}"
+.if exists(${.CURDIR}/Makefile.${TARGET_ARCH})
+.include "${.CURDIR}/Makefile.${TARGET_ARCH}"
+.elif exists(${.CURDIR}/Makefile.${TARGET_CPUARCH})
+.include "${.CURDIR}/Makefile.${TARGET_CPUARCH}"
 .endif
-.endfor