summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-08-24 16:29:09 +0000
committerimp <imp@FreeBSD.org>2010-08-24 16:29:09 +0000
commitab2de6c8176207dcca4fa7f885bf5f7dd25145ff (patch)
treeb0b1326778e86c060cbc046412635ce27dccb19e /Makefile.inc1
parent7d99c51342a411a4c0811b2bcb6db8a8355365b4 (diff)
downloadFreeBSD-src-ab2de6c8176207dcca4fa7f885bf5f7dd25145ff.zip
FreeBSD-src-ab2de6c8176207dcca4fa7f885bf5f7dd25145ff.tar.gz
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@
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc16
1 files changed, 2 insertions, 4 deletions
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
OpenPOWER on IntegriCloud