diff options
| author | Jessica Clarke <jrtc27@FreeBSD.org> | 2023-07-11 00:53:04 +0000 |
|---|---|---|
| committer | Jessica Clarke <jrtc27@FreeBSD.org> | 2023-07-11 00:53:04 +0000 |
| commit | c70dd03a7ff649f832f1d29179b9094720392bce (patch) | |
| tree | 4d427a24f229a8c10ceafdae8034d3d4df3dcf72 /Makefile.inc1 | |
| parent | 565a343ae3a30bc2973182ff8dfd2fa37d7f615f (diff) | |
| download | src-c70dd03a7ff649f832f1d29179b9094720392bce.tar.gz src-c70dd03a7ff649f832f1d29179b9094720392bce.zip | |
Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh
We run depend-cleanup.sh twice during the build. The second time is the
normal run, where we run it under WMAKEENV and thus have CROSSENV's
MACHINE(_ARCH)=${TARGET(_ARCH)} in the environment. However, the first
time is for bootstrap-tools, where it's run under BMAKEENV and we don't
have any assignments to MACHINE(_ARCH) in the environment, meaning the
script sees them as unset. In practice this doesn't matter since the
only use doesn't apply to bootstrap-tools, but it could be a future
issue. Thus, explicitly export them for depend-cleanup.sh and have the
script verify they're set.
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D40968
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 6db68b627d96..1e992b05c859 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1016,7 +1016,8 @@ _sanity_check: .PHONY .MAKE # replacing generated files. Handle these cases here in an ad-hoc fashion. _cleanobj_fast_depend_hack: .PHONY @echo ">>> Deleting stale dependencies..."; - sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP} + MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} \ + sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP} _worldtmp: .PHONY @echo |