Module Name: src
Committed By: joerg
Date: Thu Jul 19 06:33:49 UTC 2012
Modified Files:
src/lib/libpthread_dbg: Makefile
Log Message:
Match ARCHSUBDIR logic from libpthread.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libpthread_dbg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread_dbg/Makefile
diff -u src/lib/libpthread_dbg/Makefile:1.9 src/lib/libpthread_dbg/Makefile:1.10
--- src/lib/libpthread_dbg/Makefile:1.9 Wed Mar 21 05:37:43 2012
+++ src/lib/libpthread_dbg/Makefile Thu Jul 19 06:33:48 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/03/21 05:37:43 matt Exp $
+# $NetBSD: Makefile,v 1.10 2012/07/19 06:33:48 joerg Exp $
#
WARNS?= 5
@@ -7,7 +7,10 @@ WARNS?= 5
LIBPDIR= ${.CURDIR}/../libpthread
-.if exists(${LIBPDIR}/arch/${MACHINE_ARCH})
+.if defined(PTHREAD_MACHINE_ARCH) && !empty(PTHREAD_MACHINE_ARCH) && \
+ exists(${LIBPDIR}/arch/${PTHREAD_MACHINE_ARCH})
+ARCHSUBDIR= ${PTHREAD_MACHINE_ARCH}
+.elif exists(${LIBPDIR}/arch/${MACHINE_ARCH})
ARCHSUBDIR= ${MACHINE_ARCH}
.elif exists(${LIBPDIR}/arch/${MACHINE_CPU})
ARCHSUBDIR= ${MACHINE_CPU}
