Merge remote-tracking branch 'origin/main' into rebranch

swift-ci · swift-ci · commit ffe97940cdee · 2025-08-10T01:56:26.000-07:00
diff --git a/cmake/modules/SwiftConfigureSDK.cmake b/cmake/modules/SwiftConfigureSDK.cmake
@@ -440,7 +440,7 @@ macro(configure_sdk_unix name architectures)
         string(REGEX REPLACE "[-].*" "" freebsd_system_version ${CMAKE_SYSTEM_VERSION})
         message(STATUS "FreeBSD Version: ${freebsd_system_version}")
 
-        set(SWIFT_SDK_FREEBSD_ARCH_${arch}_TRIPLE "${arch}-unknown-freebsd${freebsd_system_version}}")
+        set(SWIFT_SDK_FREEBSD_ARCH_${arch}_TRIPLE "${arch}-unknown-freebsd${freebsd_system_version}")
         set(SWIFT_SDK_FREEBSD_ARCH_${arch}_MODULE "${arch}-unknown-freebsd")
       elseif("${prefix}" STREQUAL "OPENBSD")
         if(NOT arch STREQUAL "x86_64" AND NOT arch STREQUAL "aarch64")
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -2577,6 +2577,8 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
         CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
 
         SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";
+
+        SwiftOverlay_ENABLE_CXX_INTEROP = "YES";
       }
 
     Build-CMakeProject `

Original file line number	Diff line number	Diff line change
`@@ -2577,6 +2577,8 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa`
`2577`	`2577`	`CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";`
`2578`	`2578`
`2579`	`2579`	`SwiftCore_DIR = "${RuntimeBinaryCache}\cmake\SwiftCore";`
	`2580`	`+`
	`2581`	`+ SwiftOverlay_ENABLE_CXX_INTEROP = "YES";`
`2580`	`2582`	`}`
`2581`	`2583`
`2582`	`2584`	Build-CMakeProject `