Skip to content

Commit c46f61c

Browse files
committed
build: handle directories for unified build
The directory paths would collide with a cross-compiled unified build of LLVM and swift. Adjust the directories to work in that environment.
1 parent eea96a3 commit c46f61c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cmake/modules/SwiftWindowsSupport.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ function(swift_windows_generate_sdk_vfs_overlay flags)
7676
set(UCRTVersion $ENV{UCRTVersion})
7777

7878
# TODO(compnerd) use a target to avoid re-creating this file all the time
79-
configure_file("${CMAKE_SOURCE_DIR}/utils/WindowsSDKVFSOverlay.yaml.in"
80-
"${CMAKE_BINARY_DIR}/windows-sdk-vfs-overlay.yaml"
79+
configure_file("${SWIFT_SOURCE_DIR}/utils/WindowsSDKVFSOverlay.yaml.in"
80+
"${CMAKE_CURRENT_BINARY_DIR}/windows-sdk-vfs-overlay.yaml"
8181
@ONLY)
8282

8383
set(${flags}
84-
-Xclang;-ivfsoverlay;-Xclang;"${CMAKE_BINARY_DIR}/windows-sdk-vfs-overlay.yaml"
84+
-Xclang;-ivfsoverlay;-Xclang;"${CMAKE_CURRENT_BINARY_DIR}/windows-sdk-vfs-overlay.yaml"
8585
PARENT_SCOPE)
8686
endfunction()
8787

0 commit comments

Comments
 (0)