From 7220a96cfdcb47cb5f5a79f7819823a5637e9b0e Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 6 Aug 2024 13:08:46 -0700
Subject: [PATCH] Re-enable optimized compiler builtins

---
 build-windows.sh | 2 +-
 common.sh        | 3 +--
 config.toml      | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build-windows.sh b/build-windows.sh
index 5cc599c..fa0079a 100755
--- a/build-windows.sh
+++ b/build-windows.sh
@@ -30,7 +30,7 @@ clean_storage() {
 build() {
   set_llvm_build_cfg LLVM_USE_SYMLINKS TRUE
   set_rust_cfg llvm.static-libstdcpp true
-  set_rust_cfg llvm.ldflags "\"-s -static-libgcc -static\""
+  set_rust_cfg llvm.ldflags '"-s -static-libgcc -static"'
   set_rust_cfg dist.include-mingw-linker true
 
   cd rust
diff --git a/common.sh b/common.sh
index 0fdc0bb..8470c37 100644
--- a/common.sh
+++ b/common.sh
@@ -35,8 +35,7 @@ set_rust_cfg() {
 }
 
 print_rust_cfg() {
-  set_rust_cfg llvm.build-config "{ $LLVM_BUILD_CFG }"
-  echo $RUST_CFG
+  echo $RUST_CFG "'--set=llvm.build-config={ $LLVM_BUILD_CFG }'"
 }
 
 # url sha
diff --git a/config.toml b/config.toml
index e6dffae..773a223 100644
--- a/config.toml
+++ b/config.toml
@@ -19,7 +19,6 @@ tools = [
     "rustfmt",
     "rust-analyzer-proc-macro-srv",
 ]
-optimized-compiler-builtins = false
 cargo-native-static = true
 
 [install]