Fix shell scripts

topjohnwu · Aug 6, 2024 · b13e021 · b13e021
1 parent b7c45e1
commit b13e021
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/build-windows.sh b/build-windows.sh
@@ -34,8 +34,7 @@ build() {
   set_rust_cfg dist.include-mingw-linker true
 
   cd rust
-  python ./x.py --config '../config.toml' --build $TRIPLE \
-    $RUST_CFG "--set=llvm.build-config={ $LLVM_BUILD_CFG }" install
+  eval python ./x.py --config ../config.toml --build $TRIPLE $(print_rust_cfg) install
   cd ../
 
   cd out

diff --git a/build.sh b/build.sh
@@ -51,8 +51,7 @@ build() {
   set_rust_cfg rust.lto thin
 
   cd rust
-  python3 ./x.py --config "../config.toml" --host $TRIPLE \
-    $RUST_CFG "--set=llvm.build-config={ $LLVM_BUILD_CFG }" install
+  eval python3 ./x.py --config ../config.toml --host $TRIPLE $(print_rust_cfg) install
   cd ../
 
   cd out

diff --git a/common.sh b/common.sh
@@ -31,7 +31,12 @@ set_llvm_build_cfg() {
 
 # key value
 set_rust_cfg() {
-  RUST_CFG="$RUST_CFG --set=$1=$2"
+  RUST_CFG="$RUST_CFG '--set=$1=$2'"
+}
+
+print_rust_cfg() {
+  set_rust_cfg llvm.build-config "{ $LLVM_BUILD_CFG }"
+  echo $RUST_CFG
 }
 
 # url sha