Restore CMAKE_BUILD_TYPE

Author: kateinoigakukun

schemes/main/swift/0002-wasm-Configure-LLVM-for-WebAssembly-target-independe.patch

@@ -1,4 +1,4 @@
-From 724d3056fae124c059a15563a0ed1e55799cdf81 Mon Sep 17 00:00:00 2001
+From 061b9339c6c76064e3930ee81811be058ca853fc Mon Sep 17 00:00:00 2001
 From: Yuta Saito <[email protected]>
 Date: Thu, 19 Sep 2024 04:45:51 +0000
 Subject: [PATCH 2/2] [wasm] Configure LLVM for WebAssembly target
@@ -11,11 +11,11 @@ we fixed the stdlib build to use `WASI` as the system name properly in
 the previous commit. This exposed the issue that the host LLVM build
 directory is not suitable for configuring the stdlib build.
 ---
- .../products/wasmstdlib.py                    | 50 ++++++++++++++++---
- 1 file changed, 44 insertions(+), 6 deletions(-)
+ .../products/wasmstdlib.py                    | 51 ++++++++++++++++---
+ 1 file changed, 45 insertions(+), 6 deletions(-)
 
 diff --git a/utils/swift_build_support/swift_build_support/products/wasmstdlib.py b/utils/swift_build_support/swift_build_support/products/wasmstdlib.py
-index d042fc38038..03a24a85fae 100644
+index d042fc38038..053756139d5 100644
 --- a/utils/swift_build_support/swift_build_support/products/wasmstdlib.py
 +++ b/utils/swift_build_support/swift_build_support/products/wasmstdlib.py
 @@ -17,6 +17,8 @@ from . import llvm
@@ -27,7 +27,7 @@ index d042fc38038..03a24a85fae 100644
 
 
  class WasmStdlib(cmake_product.CMakeProduct):
-@@ -39,13 +41,49 @@ class WasmStdlib(cmake_product.CMakeProduct):
+@@ -39,13 +41,50 @@ class WasmStdlib(cmake_product.CMakeProduct):
          return self.args.test_wasmstdlib
 
      def build(self, host_target):
@@ -49,6 +49,7 @@ index d042fc38038..03a24a85fae 100644
 +        llvm_source_dir = os.path.join(
 +            os.path.dirname(self.source_dir), 'llvm-project', 'llvm')
 +        cmake_options = cmake.CMakeOptions()
++        cmake_options.define('CMAKE_BUILD_TYPE:STRING', self._build_variant)
 +        # compiler-rt for WebAssembly target is not installed in the host toolchain
 +        # so skip compiler health checks here.
 +        cmake_options.define('CMAKE_C_COMPILER_WORKS:BOOL', 'TRUE')
@@ -79,7 +80,7 @@ index d042fc38038..03a24a85fae 100644
          self.cmake_options.define(
              'SWIFT_STDLIB_BUILD_TYPE:STRING', self._build_variant)
 
-@@ -71,9 +109,6 @@ class WasmStdlib(cmake_product.CMakeProduct):
+@@ -71,9 +110,6 @@ class WasmStdlib(cmake_product.CMakeProduct):
          self.cmake_options.define('SWIFT_WASI_SYSROOT_PATH:STRING',
                                    self._wasi_sysroot_path(target_triple))
 
@@ -89,7 +90,7 @@ index d042fc38038..03a24a85fae 100644
          self.cmake_options.define('LLVM_DIR:PATH', llvm_cmake_dir)
 
          # Standalone stdlib configuration
-@@ -90,6 +125,9 @@ class WasmStdlib(cmake_product.CMakeProduct):
+@@ -90,6 +126,9 @@ class WasmStdlib(cmake_product.CMakeProduct):
          self.cmake_options.define('SWIFT_BUILD_STATIC_STDLIB:BOOL', 'TRUE')
          self.cmake_options.define('SWIFT_BUILD_DYNAMIC_STDLIB:BOOL', 'FALSE')
          self.cmake_options.define('SWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL', 'TRUE')
@@ -99,7 +100,7 @@ index d042fc38038..03a24a85fae 100644
          self.cmake_options.define('SWIFT_STDLIB_TRACING:BOOL', 'FALSE')
          self.cmake_options.define('SWIFT_STDLIB_HAS_ASLR:BOOL', 'FALSE')
          self.cmake_options.define('SWIFT_STDLIB_CONCURRENCY_TRACING:BOOL', 'FALSE')
-@@ -200,7 +238,7 @@ class WasmStdlib(cmake_product.CMakeProduct):
+@@ -200,7 +239,7 @@ class WasmStdlib(cmake_product.CMakeProduct):
 
  class WasmThreadsStdlib(WasmStdlib):
      def build(self, host_target):