Improve Makefile bootstrap verification #304
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jserv
requested changes
Sep 29, 2025
There was a problem hiding this comment.
Check https://cbea.ms/git-commit/ carefully and improve git commit message.
|
Don't mix independent changes into a single commit. |
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
steven-studio
force-pushed
the
feature/makefile-improvements
branch
from
f71718f to
09464aa
Compare
jserv
requested changes
Sep 29, 2025
The bootstrap target was failing with '/bin/sh: @env: not found' because the original implementation used complex shell conditionals that could cause @ to be interpreted as a shell command. Changes: - Replace 'diff -q' with 'cmp -s' for reliable binary comparison - Restructure conditional to test for success rather than failure - Use plain echo for messages to avoid macro expansion issues - Add explicit success/error messages for clarity
steven-studio
force-pushed
the
feature/makefile-improvements
branch
from
09464aa to
edd3db2
Compare
jserv
reviewed
Sep 29, 2025
| $(Q)if ! diff -q $(OUT)/$(STAGE1) $(OUT)/$(STAGE2); then \ | ||
| echo "Unable to bootstrap. Aborting"; false; \ | ||
| $(Q)if cmp -s $(OUT)/$(STAGE1) $(OUT)/$(STAGE2); then \ | ||
| echo "Bootstrap successful: Stage 1 and Stage 2 are identical"; \ |
There was a problem hiding this comment.
In the true case, it is not necessary to display messages.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
This PR improves the Makefile with better organization and more robust bootstrap verification while maintaining full self-hosting capabilities.
Key Improvements
Fixed bootstrap verification - Changed from
@ifto$(Q)ifand replaced$(VECHO)with plainechoinside shell conditionals to avoid/bin/sh: @env: not founderrorBetter organization
.PHONYdeclarations.DEFAULT_GOALexplicitEnhanced bootstrap process
cmp -sinstead ofdiff -qfor more reliable binary comparisonImproved directory handling
| $(OUT)) to prevent unnecessary rebuildsmkdir -pusage in compilation rulesAdded help target - Provides quick reference for available targets and variables
Consistency improvements
--silentto--no-print-directoryfor clearer intentCC ?= gccfor easier compiler overridedepstoDEPSfor naming consistencyTesting
What's Preserved
Summary by cubic
Strengthens Makefile bootstrap verification and fixes shell conditional errors to make the self-hosting build reliable. Also simplifies targets, flags, and directory handling for a cleaner build experience.
Bug Fixes
Refactors