svn commit: r209511 - head

[Warner Losh]

Author: imp
Date: Thu Jun 24 17:53:25 2010
New Revision: 209511
URL: http://svn.freebsd.org/changeset/base/209511

Log:
  Merge from tbemd:
  
  use MACHINE_CPUARCH instead of MACHINE_CPU since the sources for the
  CSU is based on MACHINE_CPUARCH
  
  Reviewed by:	arch@ (twice)

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Jun 24 16:32:20 2010	(r209510)
+++ head/Makefile.inc1	Thu Jun 24 17:53:25 2010	(r209511)
@@ -1108,10 +1108,10 @@ _prereq_libs= gnu/lib/libssp/libssp_nons
 # all shared libraries for ELF.
 #
 _startup_libs=	gnu/lib/csu
-.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
-_startup_libs+=	lib/csu/${MACHINE_ARCH}-elf
+.if exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf)
+_startup_libs+=	lib/csu/${MACHINE_CPUARCH}-elf
 .else
-_startup_libs+=	lib/csu/${MACHINE_ARCH}
+_startup_libs+=	lib/csu/${MACHINE_CPUARCH}
 .endif
 _startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libc