diff options
| author | lukem <lukem@NetBSD.org> | 2023-06-03 21:23:49 +0000 |
|---|---|---|
| committer | lukem <lukem@NetBSD.org> | 2023-06-03 21:23:49 +0000 |
| commit | 78ce53a2b40196397b4afaa9b39d08191970b95e (patch) | |
| tree | c95eba696ae5b029f27ed66b9d45aca47a08a077 | |
| parent | 3e527b79b3f6a57d205c1f72fa2e4115b471e2ab (diff) | |
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.
| -rw-r--r-- | share/mk/bsd.obj.mk | 4 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 9d392c15b36..7792c49564d 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -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}.${BUILDID} __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/*} == "" diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 44d809e3fc4..0e29cef376c 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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 \ |
