Merge pull request #83379 from compnerd/overlay-flags

Overlay: adjust flags and VFS overlay

Author: compnerd

Runtimes/Overlay/Windows/CRT/CMakeLists.txt

@@ -14,8 +14,9 @@ target_compile_definitions(swiftCRT PRIVATE
 target_compile_options(swiftCRT PRIVATE
   "SHELL:-Xfrontend -disable-force-load-symbols"
   "SHELL:-Xcc -D_USE_MATH_DEFINES")
+target_link_libraries(swiftCRT PUBLIC
+  ClangModules)
 target_link_libraries(swiftCRT PRIVATE
-  ClangModules
   swiftCore)
 
 # FIXME: Why is this not implicitly in the interface flags?

Runtimes/Overlay/Windows/clang/CMakeLists.txt

@@ -25,7 +25,7 @@ roots:
       - name: module.modulemap
         type: file
         external-contents: "@CMAKE_CURRENT_SOURCE_DIR@/ucrt.modulemap"
-  - name: "@VCToolsInstallDir@include"
+  - name: "@VCToolsInstallDir@/include"
     type: directory
     contents:
       - name: module.modulemap