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>
This commit is contained in:
parent
d2b9185176
commit
21eb01cbce
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=241751
@ -81,10 +81,9 @@ SUBDIR= PSD.doc
|
|||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
.if defined(.PARSEDIR)
|
||||||
|
# we cannot rely on anything but bmake to parse this correctly.
|
||||||
.if empty(isBSD44:M${OS})
|
.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
|
MANTARGET=cat
|
||||||
INSTALL?=${srcdir}/install-sh
|
INSTALL?=${srcdir}/install-sh
|
||||||
.if (${MACHINE} == "sun386")
|
.if (${MACHINE} == "sun386")
|
||||||
@ -95,7 +94,7 @@ SRCS+= sigcompat.c
|
|||||||
CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART
|
CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART
|
||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
.if defined(.PARSEDIR)
|
|
||||||
.if make(obj) || make(clean)
|
.if make(obj) || make(clean)
|
||||||
SUBDIR+= unit-tests
|
SUBDIR+= unit-tests
|
||||||
.endif
|
.endif
|
||||||
|
Loading…
Reference in New Issue
Block a user