Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Aug 2010 16:29:09 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r211758 - head
Message-ID:  <201008241629.o7OGT9DU081532@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Tue Aug 24 16:29:09 2010
New Revision: 211758
URL: http://svn.freebsd.org/changeset/base/211758

Log:
  The order was correct before.  I'd talked to Nathan about this before,
  so this must have been mismerged into tbemd before I merged it back to
  head.  This unbreaks this on powerpc64
  
  Submitted by:	nathanw@

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Aug 24 16:11:12 2010	(r211757)
+++ head/Makefile.inc1	Tue Aug 24 16:29:09 2010	(r211758)
@@ -1131,12 +1131,10 @@ _prereq_libs= gnu/lib/libssp/libssp_nons
 # all shared libraries for ELF.
 #
 _startup_libs=	gnu/lib/csu
-.if exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf)
-_startup_libs+=	lib/csu/${MACHINE_CPUARCH}-elf
+.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
+_startup_libs+=	lib/csu/${MACHINE_ARCH}-elf
 .elif exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf)
 _startup_libs+=	lib/csu/${MACHINE_CPUARCH}-elf
-.elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH})
-_startup_libs+=	lib/csu/${MACHINE_ARCH}
 .else
 _startup_libs+=	lib/csu/${MACHINE_CPUARCH}
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008241629.o7OGT9DU081532>