Differential D40968

Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh
ClosedPublic
Actions

Authored by jrtc27 on Jul 10 2023, 11:50 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Thu, Dec 25, 7:52 PM

	Unknown Object (File)
	Dec 22 2025, 2:36 PM

	Unknown Object (File)
	Nov 16 2025, 5:30 AM

	Unknown Object (File)
	Nov 16 2025, 3:13 AM

	Unknown Object (File)
	Nov 15 2025, 11:23 PM

	Unknown Object (File)
	Nov 15 2025, 4:59 PM

	Unknown Object (File)
	Nov 15 2025, 4:58 PM

	Unknown Object (File)
	Oct 29 2025, 9:38 AM

View All 64 Files

Subscribers

Details

Reviewers

Commits

rG37d2e25a2dc7: Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh
rGc70dd03a7ff6: Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh

Summary

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.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 52556
Build 49447: arc lint + arc unit

Event Timeline

jrtc27 created this revision.Jul 10 2023, 11:50 PM

Herald added a subscriber: emaste. · View Herald TranscriptJul 10 2023, 11:50 PM

jrtc27 requested review of this revision.Jul 10 2023, 11:50 PM

Harbormaster completed remote builds in B52556: Diff 124468.Jul 10 2023, 11:50 PM

jrtc27 mentioned this in D31007: depend-cleanup: Add verbose (-v) and pretend/dry-run (-n) flags.Jul 10 2023, 11:51 PM

jrtc27 added a child revision: D31007: depend-cleanup: Add verbose (-v) and pretend/dry-run (-n) flags.Jul 10 2023, 11:51 PM

jrtc27 edited the summary of this revision. (Show Details)

Makes sense

This revision is now accepted and ready to land.Jul 11 2023, 12:02 AM

sjg added a subscriber: sjg.Jul 11 2023, 12:52 AM

sjg added inline comments.

tools/build/depend-cleanup.sh
27	FWIW I'd be inclinded to add an error() function - hate repeating logic test -z "$MACHINE" && error MACHINE not set etc

Closed by commit rGc70dd03a7ff6: Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh (authored by jrtc27). · Explain WhyJul 11 2023, 12:53 AM

This revision was automatically updated to reflect the committed changes.

jrtc27 added a commit: rGc70dd03a7ff6: Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh.

jrtc27 added inline comments.Jul 11 2023, 1:00 AM

tools/build/depend-cleanup.sh
27	I would have done except that D31007 already does that and I didn't feel the need to reorganise things just for that

brooks added a commit: rG37d2e25a2dc7: Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh.Dec 9 2024, 9:49 PM

Revision Contents
Changeset List

Path

Size

3 lines

tools/

build/

depend-cleanup.sh

10 lines

Diff 124468

Makefile.inc1

Loading...

tools/build/depend-cleanup.sh

Loading...