svn commit: r264260 - head/sys/boot

[Ed Maste]

Author: emaste
Date: Tue Apr  8 17:40:09 2014
New Revision: 264260
URL: http://svnweb.freebsd.org/changeset/base/264260

Log:
  Revert r264132, disconnecting sys/boot/amd64 for now
  
  Some 64-bit Ficl warnings broke tinderbox builds.

Modified:
  head/sys/boot/Makefile

Modified: head/sys/boot/Makefile
==============================================================================
--- head/sys/boot/Makefile	Tue Apr  8 14:18:39 2014	(r264259)
+++ head/sys/boot/Makefile	Tue Apr  8 17:40:09 2014	(r264260)
@@ -9,12 +9,9 @@ SUBDIR+=		ficl
 .endif
 
 # Pick the machine-dependent subdir based on the target architecture.
-ADIR=			${MACHINE:S/powerpc64/powerpc/}
+ADIR=			${MACHINE:S/amd64/i386/:S/powerpc64/powerpc/}
 .if exists(${.CURDIR}/${ADIR}/.)
 SUBDIR+=		${ADIR}
 .endif
-.if ${MACHINE} == "amd64"
-SUBDIR+=		i386
-.endif
 
 .include <bsd.subdir.mk>