Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Servant extraction on US #2252

Merged
merged 2 commits into from
Feb 23, 2025
Merged

Fix Servant extraction on US #2252

merged 2 commits into from
Feb 23, 2025

Conversation

Xeeynamo
Copy link
Owner

The US build chain does not currently extract the servant overlays properly due to a minor misspelling on PSX_US_SERVANTS. This PR fixes it.

I think the reason why it did not impact the CI is because the $(BUILD_DIR)/tt_%.elf rule also tries to build $(BUILD_DIR)/tt_%.ld. This is wrong as the dependency $$(call list_o_files,servant/tt_$$*) right next to it will try to compile C files in search of yet-to-be-extracted nonmatching assembly files, making the whole build system to fail. I think this is only noticeable on high parallelised builds.

Xeeynamo and others added 2 commits February 23, 2025 13:35
The US build chain does not currently extract the servant overlays properly due to a minor misspelling on `PSX_US_SERVANTS`. This PR fixes it.

I think the reason why it did not impact the CI is because the `$(BUILD_DIR)/tt_%.elf` rule also tries to build `$(BUILD_DIR)/tt_%.ld`. This is wrong as the dependency `$$(call list_o_files,servant/tt_$$*)` right next to it will try to compile C files in search of yet-to-be-extracted nonmatching assembly files, making the whole build system to fail. I think this is only noticeable on high parallelised builds.
@Xeeynamo Xeeynamo merged commit 5b9ded1 into master Feb 23, 2025
10 checks passed
@Xeeynamo Xeeynamo deleted the makefile-servant-fix branch February 23, 2025 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants