[REBASE & FF] Cherry-Pick Recent BaseTools Changes and Untangle GenStm Interaction#1811
Merged
Merged
Conversation
Contributor
❌ QEMU Validation FailedSource Dependencies
Results
Workflow run: https://github.com/microsoft/mu_basecore/actions/runs/27046079509 This comment was automatically generated by the Mu QEMU PR Validation workflow. |
apop5
approved these changes
May 29, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## release/202511 #1811 +/- ##
=================================================
Coverage ? 2.25%
=================================================
Files ? 1636
Lines ? 420402
Branches ? 5035
=================================================
Hits ? 9469
Misses ? 410851
Partials ? 82
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
kuqin12
approved these changes
Jun 5, 2026
…sage" This temporarily reverts commit 9601f61 to better fix up history.
This reverts commit 35f2ed5 temporarily as part of it has been upstreamed to edk2.
Update Edk2ToolsBuild.py to support using Linux/CLANG and Windows Mingw/CLANG environments to build C tools within the BaseTools directory. The environment variable settings CC=clang and CXX=clang++ must also be set before running Edk2ToolsBuild.py to enable the use of the clang compiler. PATH must also be set to include the path to the installed version of clang and clang++ to use. If CC and CXX are not set, the the default compiler is used. When Mingw CLANG environment is being used, CLANG_BIN must be set to the path to the CLANG tools so the mingw-make.exe utility can be used to process BaseTools makefiles. Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com> (cherry picked from commit 85e2fef)
… on Windows Currently, Edk2BaseToolsBuild.py cleans before doing the build on Linux, but doesn't do so on Windows. It has been observed on Windows that the incremental build can lead to a bad state of some logic from the old build and some from the new build. This commit aligns Windows to Linux and always do a clean before building on both OSes. Signed-off-by: Oliver Smith-Denny <osde@microsoft.com> (cherry picked from commit b313503a60e987f0c2c131abe588a5d06e33f8c5)
Adds GenStm as a C tool. Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Description
This series of commits attempts to untangle some mu_changes in BaseTools for GenStm with the upstream in order to pull down the change to clean BaseTools before building them. This could have been deferred to the next integration, but folks have wanted the basetools clean and this work had to be done at some point; likely would have been forgotten at the next integration, so I did it now. It can certainly be deferred.
This PR does the following:
The final situation is only Edk2ToolsBuild.py is changed.
How This Was Tested
BaseTools build. A GenStm test would be appreciated.
Integration Instructions
N/A.