From 21eb01cbceeedbdb04b5baeb0c37eaed68e61d58 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Fri, 19 Oct 2012 19:56:17 +0000 Subject: [PATCH] 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 --- usr.bin/bmake/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 88f64743c30c..ea21728f94d5 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