Normalize path for LLVM_EXTERNAL_SWIFT_SOURCE_DIR #10949
+3
−2
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.
Since #10935 and #10937 landed, we are seeing failures while configuring llvm-project on Windows CI (see example failure). The root cause is unescaped path separators in
LLVM_EXTERNAL_SWIFT_SOURCE_DIR
, which leads to CMake configuration errors on Windows.This PR addresses the issue by using
cmake_path
to normalizeLLVM_EXTERNAL_SWIFT_SOURCE_DIR
before it is appended toCMAKE_MODULE_PATH
. This ensures 8000 the path is correctly formatted and portable across all supported hosts.For context,
LLVM_EXTERNAL_SWIFT_SOURCE_DIR
is used in two places in llvm-project. The other use site leveragesinclude_directories
, which already handles path separators correctly on different hosts (seelldb/cmake/modules/LLDBConfig.cmake
)Testing:
Note: If landed, this change will need to be cherry-picked in next, and release/6.2