Skip to content

Conversation

@hjyamauchi
Copy link
Contributor

No description provided.

@hjyamauchi
Copy link
Contributor Author

@swift-ci please test

utils/build.ps1 Outdated
Comment on lines 1626 to 1627
$CXXFLAGS += @("/clang:-fdepscan=inline", "/clang:-fdepscan-include-tree",
"-Xclang", "-fcas-path", "-Xclang", $CASPath)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$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);
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@hjyamauchi
Copy link
Contributor Author

@swift-ci please test

@hjyamauchi hjyamauchi requested a review from compnerd October 17, 2025 00:27
@hjyamauchi
Copy link
Contributor Author

@swift-ci please test macos platform

@hjyamauchi
Copy link
Contributor Author

@swift-ci please test

@hjyamauchi hjyamauchi marked this pull request as ready for review October 18, 2025 02:05
@hjyamauchi
Copy link
Contributor Author

PTAL @compnerd

@@ -560,6 +564,10 @@ if (-not $PinnedBuild) {

$PinnedToolchain = [IO.Path]::GetFileNameWithoutExtension($PinnedBuild)

if ($EnableCAS -and ($UseHostToolchain -or ($PinnedVersion -ne "0.0.0"))) {
Copy link
Contributor

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?

Copy link
Contributor Author

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",
Copy link
Member

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.

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.

3 participants