[compilers] Use a pre-configure setup step #856
Conversation
This file contains 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
Steelskin
force-pushed
the
fabrice/mac-build-compilers-alt
branch
from
fde4ec2 to
3243bb7
Compare
Steelskin
force-pushed
the
fabrice/mac-build-compilers-alt
branch
from
3243bb7 to
824eea7
Compare
Steelskin
changed the title
Steelskin
force-pushed
the
fabrice/mac-build-compilers-alt
branch
7 times, most recently
from
4d4d026 to
62027d9
Compare
* Add a preliminary step to export the context for the compiler configuration step. This makes it easier to debug the compiler configuration step by seeing the full command line invocation on the GHA page.
Steelskin
force-pushed
the
fabrice/mac-build-compilers-alt
branch
from
62027d9 to
b5f43a6
Compare
|
PTAL. This is how the compilers configure step shows up as before this change: And after: |
Steelskin
requested review from
compnerd and
hjyamauchi
and removed request for
compnerd
hjyamauchi
reviewed
Jan 7, 2025
| $CACHE="${{ github.workspace }}/SourceCache/swift/cmake/caches/Windows-aarch64.cmake" | ||
|
|
||
| # FIXME(compnerd) re-enable runtimes after we sort out compiler-rt | ||
| (Get-Content ${{ github.workspace }}/SourceCache/swift/cmake/caches/Windows-aarch64.cmake).Replace(' runtimes', '') | Set-Content ${{ github.workspace }}/SourceCache/swift/cmake/caches/Windows-aarch64.cmake | ||
| } else { | ||
| # FIXME(steelskin) Setting `CMAKE_SYSTEM_NAME and `CMAKE_SYSTEM_PROCESSOR` breaks the compiler-rt build | ||
| $ExtraFlags = "" |
There was a problem hiding this comment.
I had the impression that this PR doesn't intend to change the behavior, but does this line 998 change the behavior?
There was a problem hiding this comment.
I slightly changed the way ExtraFlags is populated, compared to the EXTRA_FLAGS array. On line 983, ExtraFlags is now initialized to ${{ matrix.extra_flags }}. Before, it was initialized to an empty array and then ${{ matrix.extra_flags }} was added in all cases, except for Windows x64. I am now adding ${{ matrix.extra_flags }} unconditionally and then resetting it for Windows x64. In the long term, we'll want to fix the issue in CMake and remove this line, which will also make this script simpler.
While this is a change, it is functionally identical as the final command line invocation is the same as before.
hjyamauchi
approved these changes
Jan 8, 2025
compnerd
reviewed
Jan 8, 2025
Comment on lines
+1036
to
+1047
| Write-Output "cc=${CC}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "cxx=${CXX}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "swiftc=${SWIFTC}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "cxxflags=${CxxFlags}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "swiftflags=${SwiftFlags}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "extra_flags=${ExtraFlags}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "cache=${CACHE}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "clang_location=${CLANG_LOCATION}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "libpython_path=${LIBPYTHON_PATH}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "python_include_dir=${PYTHON_INCLUDE_DIR}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "python_binary=${PYTHON_BINARY}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append | ||
| Write-Output "sdkroot=${SDKROOT}" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append |
There was a problem hiding this comment.
Can you change this to a heredoc instead?
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.
configuration step. This makes it easier to debug the compiler
configuration step by seeing the full command line invocation on the
GHA page.