-
Notifications
You must be signed in to change notification settings - Fork 10.6k
Add CAS support #84970
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
base: main
Are you sure you want to change the base?
Add CAS support #84970
Conversation
|
@swift-ci please test |
utils/build.ps1
Outdated
| $CXXFLAGS += @("/clang:-fdepscan=inline", "/clang:-fdepscan-include-tree", | ||
| "-Xclang", "-fcas-path", "-Xclang", $CASPath) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| $CXXFLAGS += @("/clang:-fdepscan=inline", "/clang:-fdepscan-include-tree", | |
| "-Xclang", "-fcas-path", "-Xclang", $CASPath) | |
| $CXXFLAGS += if ($UseGNUDriver) { | |
| @("-fdepscan=inline", "-fdepscan-include-tree", "-Xclang", "-fcas-path", "-Xclang", $CASPath); | |
| } else { | |
| @("/clang:-fdepscan=inline", "/clang:-fdepscan-include-tree", "-Xclang", "-fcas-path", "-Xclang", $CASPath); | |
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
5bf18b2 to
0b66be9
Compare
|
@swift-ci please test |
|
@swift-ci please test macos platform |
0b66be9 to
8e8055e
Compare
|
@swift-ci please test |
|
PTAL @compnerd |
| @@ -560,6 +564,10 @@ if (-not $PinnedBuild) { | |||
|
|
|||
| $PinnedToolchain = [IO.Path]::GetFileNameWithoutExtension($PinnedBuild) | |||
|
|
|||
| if ($EnableCAS -and ($UseHostToolchain -or ($PinnedVersion -ne "0.0.0"))) { | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit. would not it be better to check llvm version instead llvm-project/llvm/utils/lit.py --version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This intends to check for a swift main-branch build which is currently the only swift build/repo where it currently works and so it's more about the swift version than the LLVM version
| @@ -158,6 +158,10 @@ param | |||
| [ValidatePattern('^\d+(\.\d+)*$')] | |||
| [string] $SCCacheVersion = "0.10.0", | |||
|
|
|||
| # Build with CAS | |||
| [switch] $EnableCAS = $false, | |||
| [string] $CASPath = "S:\cas", | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use ImageRoot rather than S:. The swift.org CI uses a different root (T:).
I wonder if we should just make this a required parameter from the user.
No description provided.