Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Oct 2024 16:27:13 GMT
From:      "Simon J. Gerraty" <sjg@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: c5c0e79bb0ad - main - Add local.meta.stage.mk
Message-ID:  <202410161627.49GGRD8B077145@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=c5c0e79bb0ad0a1b9b9688aaf919826c4c386411

commit c5c0e79bb0ad0a1b9b9688aaf919826c4c386411
Author:     Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2024-10-16 16:25:16 +0000
Commit:     Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2024-10-16 16:26:29 +0000

    Add local.meta.stage.mk
    
    We need to undo NO_OBJ if we are staging
    as it causes us to drop the stage* target cookies in src tree
    which is bad, and may break doing the same targets for multiple
    architectures.
    
    Reviewed by:    stevek
---
 share/mk/local.meta.stage.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/share/mk/local.meta.stage.mk b/share/mk/local.meta.stage.mk
new file mode 100644
index 000000000000..8a59631e57ae
--- /dev/null
+++ b/share/mk/local.meta.stage.mk
@@ -0,0 +1,6 @@
+.if defined(NO_OBJ) && ${__objdir:U${.CURDIR}} != ${.CURDIR}
+# NO_OBJ would cause us to dribble stage* into .CURDIR
+# which will prevent the targets being done for multiple MACHINES
+.undef NO_OBJ
+.OBJDIR: ${__objdir}
+.endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410161627.49GGRD8B077145>