diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-02-03 20:49:02 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-02-03 20:49:02 +0000 |
| commit | a0067f51183d8b472112a095c7c0d32145ff98b3 (patch) | |
| tree | 96321fd1bd5ffaea0d4f16723ebb5a9cc4a139e9 /gnu | |
| parent | 7dfb23e53684ac495a4cf9a6a5188a1f91d5885a (diff) | |
Use MACHINE_CPU instead of MACHINE_ARCH to pick the correct machine dependent
files or directories when applicable.
The inspiration and name of MACHINE_CPU come from NetBSD, although the way to
provide it to Makefiles is completely different.
ok kettenis@
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/binutils/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/libsmutil/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper b/gnu/usr.bin/binutils/Makefile.bsd-wrapper index ca5a04d00eb..9eeb0ced47e 100644 --- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper +++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.73 2008/08/22 13:02:53 kettenis Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.74 2010/02/03 20:48:58 miod Exp $ NEW_BINUTILS=alpha amd64 arm hppa hppa64 i386 mips64 powerpc sh sparc sparc64 -.for _arch in ${MACHINE_ARCH} +.for _arch in ${MACHINE_CPU} . if !empty(NEW_BINUTILS:M${_arch}) USING_NEW_BINUTILS?=yes .else diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper b/gnu/usr.bin/perl/Makefile.bsd-wrapper index 12557c8fa23..d267907ff48 100644 --- a/gnu/usr.bin/perl/Makefile.bsd-wrapper +++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.80 2010/01/05 13:46:39 millert Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.81 2010/02/03 20:49:00 miod Exp $ # # Build wrapper for Perl 5.10.0 # @@ -195,7 +195,7 @@ install.lib: .endif chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_p.a .endif -.if !defined(NOPIC) && (${MACHINE_ARCH} != "mips64") +.if !defined(NOPIC) && (${MACHINE_CPU} != "mips64") ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \ lib${LIB}_pic.a ${DESTDIR}${LIBDIR} .if (${INSTALL_COPY} != "-p") diff --git a/gnu/usr.sbin/sendmail/libsmutil/Makefile b/gnu/usr.sbin/sendmail/libsmutil/Makefile index 8eb8633b89d..a4decc6458b 100644 --- a/gnu/usr.sbin/sendmail/libsmutil/Makefile +++ b/gnu/usr.sbin/sendmail/libsmutil/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2004/11/02 21:12:15 pefo Exp $ +# $OpenBSD: Makefile,v 1.6 2010/02/03 20:49:00 miod Exp $ LIB= smutil SRCS= debug.c err.c lockfile.c safefile.c snprintf.c cf.c ENVDEF= -DNOT_SENDMAIL -.if ${MACHINE_ARCH} == mips64 +.if ${MACHINE_CPU} == mips64 CFLAGS+= -fno-stack-protector .endif |