diff options
| author | imp <imp@FreeBSD.org> | 2010-09-13 01:43:10 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-09-13 01:43:10 +0000 |
| commit | 6a8c774078fc54125d358503149bb2caf40ae8fa (patch) | |
| tree | 56cce075ef78f4668c75cef9ff2144323f6cb80e /lib/libthr/support | |
| parent | 681e259e01efa9c7cedfea30531274a306838ddd (diff) | |
| download | FreeBSD-src-6a8c774078fc54125d358503149bb2caf40ae8fa.zip FreeBSD-src-6a8c774078fc54125d358503149bb2caf40ae8fa.tar.gz | |
Merge from tbemd, with a small amount of rework:
For all libthr contexts, use ${MACHINE_CPUARCH}
for all libc contexts, use ${MACHINE_ARCH} if it exists, otherwise use
${MACHINE_CPUARCH}
Move some common code up a layer (the .PATH statement was the same in
all the arch submakefiles).
# Hope she hasn't busted powerpc64 with this...
Diffstat (limited to 'lib/libthr/support')
| -rw-r--r-- | lib/libthr/support/Makefile.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/libthr/support/Makefile.inc b/lib/libthr/support/Makefile.inc index bcf4393..35a15f8 100644 --- a/lib/libthr/support/Makefile.inc +++ b/lib/libthr/support/Makefile.inc @@ -1,9 +1,16 @@ # $FreeBSD$ .PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys +# libc must search machine_arch, then machine_cpuarch, but libthr has all its +# code implemented in machine_cpuarch. Cope. +.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys) +.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH} +.else +.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys +CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH} +.endif SYSCALLS= thr_new |
