svn commit: r211822 - head/lib/libc

[Nathan Whitehorn]

Author: nwhitehorn
Date: Wed Aug 25 20:48:24 2010
New Revision: 211822
URL: http://svn.freebsd.org/changeset/base/211822

Log:
  Allow ABIs to provide their own LIBC_ARCH in a more generic way. As a side
  effect, this fixes the build on powerpc64.
  
  Reviewed by:	imp

Modified:
  head/lib/libc/Makefile

Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile	Wed Aug 25 20:37:58 2010	(r211821)
+++ head/lib/libc/Makefile	Wed Aug 25 20:48:24 2010	(r211822)
@@ -5,10 +5,11 @@ SHLIBDIR?= /lib
 
 .include <bsd.own.mk>
 
-# We have to special case powerpc and powerpc64, since they mostly have
-# the same source implementation.  libc is very different due to large
-# ABI differences.
-.if ${MACHINE_ARCH} == "powerpc"
+# Pick the current architecture directory for libc. In general, this is
+# named MACHINE_CPUARCH, but some ABIs are different enough to require
+# their own libc, so allow a directory named MACHINE_ARCH to override this.
+
+.if exists(${.CURDIR}/${MACHINE_ARCH})
 LIBC_ARCH=${MACHINE_ARCH}
 .else
 LIBC_ARCH=${MACHINE_CPUARCH}