git: 3cc91b77514d - main - Revert "src.sys.obj.mk: Export OBJTOP"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 02 Jun 2024 23:35:51 UTC
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3cc91b77514de209d7e6c2217cda2e44809280d3 commit 3cc91b77514de209d7e6c2217cda2e44809280d3 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2024-06-02 23:33:52 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2024-06-02 23:33:52 +0000 Revert "src.sys.obj.mk: Export OBJTOP" Unfortunately this results in make universe's environment, i.e. corresponding to the host, being used for every one of its sub-makes, so they're in the wrong place and trample over each other. This reverts commit 2b7c1402f96be2d2986738e32706dab7b5691ef0. --- share/mk/src.sys.obj.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk index e4c31f746f3d..708559edcdb8 100644 --- a/share/mk/src.sys.obj.mk +++ b/share/mk/src.sys.obj.mk @@ -94,9 +94,6 @@ OBJTOP:= ${OBJROOT}${MACHINE}.${MACHINE_ARCH} # TARGET.TARGET_ARCH handled in OBJROOT already. OBJTOP:= ${OBJROOT:H} .endif # ${MK_UNIFIED_OBJDIR} == "yes" -.if ${.MAKE.LEVEL} > 0 -.export OBJTOP -.endif .endif # empty(OBJTOP) # Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX.