diff options
| author | marcel <marcel@FreeBSD.org> | 2012-10-19 19:56:17 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2012-10-19 19:56:17 +0000 |
| commit | c9d76d3d679748dc89ab517b7cf41ed5b2e3520a (patch) | |
| tree | ccb2ff56dbb6ed33e8304a4fe2b74311a1f35e75 /usr.bin/bmake | |
| parent | 6829475c5cebdf6c75afbc45df13402cd30122cd (diff) | |
| download | FreeBSD-src-c9d76d3d679748dc89ab517b7cf41ed5b2e3520a.zip FreeBSD-src-c9d76d3d679748dc89ab517b7cf41ed5b2e3520a.tar.gz | |
Fix a bootstrapping problem where the first bmake (built by FreeBSD's
make) ended up being built with -DFORCE_MACHINE. This broke the lib32
built for amd64 & powerpc64.
This fix is comes with the next import of bmake, but is committed here
and now to minimize the exposure to the bug.
Submitted by: Simon Gerraty <sjg@juniper.net>
Diffstat (limited to 'usr.bin/bmake')
| -rw-r--r-- | usr.bin/bmake/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 88f6474..ea21728 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -81,10 +81,9 @@ SUBDIR= PSD.doc .endif .endif +.if defined(.PARSEDIR) +# we cannot rely on anything but bmake to parse this correctly. .if empty(isBSD44:M${OS}) -# XXX not sure if we still want this given that configure -# lets us force or not the definition of MACHINE. -CFLAGS_main.o+= "-DFORCE_MACHINE=\"${MACHINE}\"" MANTARGET=cat INSTALL?=${srcdir}/install-sh .if (${MACHINE} == "sun386") @@ -95,7 +94,7 @@ SRCS+= sigcompat.c CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART .endif .endif -.if defined(.PARSEDIR) + .if make(obj) || make(clean) SUBDIR+= unit-tests .endif |
