From ab2de6c8176207dcca4fa7f885bf5f7dd25145ff Mon Sep 17 00:00:00 2001 From: imp Date: Tue, 24 Aug 2010 16:29:09 +0000 Subject: 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@ --- Makefile.inc1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Makefile.inc1') diff --git a/Makefile.inc1 b/Makefile.inc1 index 36c1a34..53b43a9 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1131,12 +1131,10 @@ _prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc # 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 -- cgit v1.1