svn commit: r241751 - head/usr.bin/bmake

[Marcel Moolenaar]

Author: marcel
Date: Fri Oct 19 19:56:17 2012
New Revision: 241751
URL: http://svn.freebsd.org/changeset/base/241751

Log:
  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 at juniper.net>

Modified:
  head/usr.bin/bmake/Makefile

Modified: head/usr.bin/bmake/Makefile
==============================================================================
--- head/usr.bin/bmake/Makefile	Fri Oct 19 19:28:35 2012	(r241750)
+++ head/usr.bin/bmake/Makefile	Fri Oct 19 19:56:17 2012	(r241751)
@@ -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