Module Name:    src
Committed By:   lukem
Date:           Sat Jun  3 21:23:50 UTC 2023

Modified Files:
        src/share/mk: bsd.obj.mk bsd.own.mk

Log Message:
bsd.obj.mk: move MKHOSTOBJ to bsd.own.mk

Add default for MKHOSTOBJ=no to to bsd.own.mk _MKVARS.no.
Simplify bsd.obj.mk check.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/share/mk/bsd.obj.mk
cvs rdiff -u -r1.1339 -r1.1340 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.obj.mk
diff -u src/share/mk/bsd.obj.mk:1.53 src/share/mk/bsd.obj.mk:1.54
--- src/share/mk/bsd.obj.mk:1.53	Tue Mar 29 22:48:04 2022
+++ src/share/mk/bsd.obj.mk	Sat Jun  3 21:23:49 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.obj.mk,v 1.53 2022/03/29 22:48:04 christos Exp $
+#	$NetBSD: bsd.obj.mk,v 1.54 2023/06/03 21:23:49 lukem Exp $
 
 .if !defined(_BSD_OBJ_MK_)
 _BSD_OBJ_MK_=1
@@ -51,7 +51,7 @@ __usrobjdirpf:=	${__usrobjdirpf}.${BUILD
 __need_objdir_target=yes
 .endif
 
-.if defined(OBJHOSTMACHINE) && (${MKHOSTOBJ:Uno} != "no")
+.if defined(OBJHOSTMACHINE) && (${MKHOSTOBJ} != "no")
 # In case .CURDIR has been twiddled by a .mk file and is now relative,
 # make it absolute again.
 .if ${__curdir:M/*} == ""

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1339 src/share/mk/bsd.own.mk:1.1340
--- src/share/mk/bsd.own.mk:1.1339	Sat Jun  3 21:23:07 2023
+++ src/share/mk/bsd.own.mk	Sat Jun  3 21:23:49 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1339 2023/06/03 21:23:07 lukem Exp $
+#	$NetBSD: bsd.own.mk,v 1.1340 2023/06/03 21:23:49 lukem Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1355,6 +1355,7 @@ _MKVARS.no= \
 	MKDTRACE \
 	MKFIRMWARE \
 	MKGROFFHTMLDOC \
+	MKHOSTOBJ \
 	MKKYUA \
 	MKLIBCXX \
 	MKLINT \

Reply via email to