talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys.dirdeps.mk use ?= for OBJTOP 

This broke bmake's after-import step.
This commit is contained in:
Simon J. Gerraty 2023-05-13 10:46:24 -07:00
parent e0e24ae5d6
commit 477f6e3c96
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/bmake/mk/sys.dirdeps.mk
View File

@ -123,7 +123,7 @@ MACHINE_OBJ.host = ${HOST_TARGET}
MACHINE_OBJ.host32 = ${HOST_TARGET32}
MACHINE_OBJ.${MACHINE} ?= ${TARGET_OBJ_SPEC}
MACHINE_OBJDIR = ${MACHINE_OBJ.${MACHINE}}
OBJTOP = ${OBJROOT}/${MACHINE_OBJDIR}
OBJTOP ?= ${OBJROOT}/${MACHINE_OBJDIR}
# we do not use MAKEOBJDIRPREFIX
.undef MAKEOBJDIRPREFIX

2
share/mk/sys.dirdeps.mk
View File

@ -123,7 +123,7 @@ MACHINE_OBJ.host = ${HOST_TARGET}
MACHINE_OBJ.host32 = ${HOST_TARGET32}
MACHINE_OBJ.${MACHINE} ?= ${TARGET_OBJ_SPEC}
MACHINE_OBJDIR = ${MACHINE_OBJ.${MACHINE}}
OBJTOP = ${OBJROOT}/${MACHINE_OBJDIR}
OBJTOP ?= ${OBJROOT}/${MACHINE_OBJDIR}
# we do not use MAKEOBJDIRPREFIX
.undef MAKEOBJDIRPREFIX

2
usr.bin/bmake/Makefile.config
View File

@ -7,7 +7,7 @@ SRCTOP?= ${.CURDIR:H:H}
# things set by configure
_MAKE_VERSION?=20230414
_MAKE_VERSION?=20230510
prefix?= /usr
srcdir= ${SRCTOP}/contrib/bmake

5
usr.bin/bmake/unit-tests/Makefile
View File

@ -2,9 +2,9 @@
# See contrib/bmake/bsd.after-import.mk
#
# $FreeBSD$
# $Id: Makefile,v 1.193 2023/02/25 20:03:25 sjg Exp $
# $Id: Makefile,v 1.195 2023/05/10 18:26:24 sjg Exp $
#
# $NetBSD: Makefile,v 1.333 2023/02/25 19:30:32 sjg Exp $
# $NetBSD: Makefile,v 1.335 2023/05/10 13:03:06 rillig Exp $
#
# Unit tests for make(1)
#
@ -378,6 +378,7 @@ TESTS+= varmod-loop-delete
TESTS+= varmod-loop-varname
TESTS+= varmod-match
TESTS+= varmod-match-escape
TESTS+= varmod-mtime
TESTS+= varmod-no-match
TESTS+= varmod-order
TESTS+= varmod-order-numeric