Minor code cleanup

Author: topjohnwu

build-windows.sh

@@ -26,7 +26,7 @@ clean_storage() {
     '/c/Program Files/PostgreSQL' '/c/Program Files/dotnet' \
     "$JAVA_HOME_8_X64" "$JAVA_HOME_11_X64" "$JAVA_HOME_17_X64" \
     "$GOROOT_1_15_X64" "$GOROOT_1_16_X64" "$GOROOT_1_17_X64" "$GOROOT_1_18_X64"
-  
+
   # Remove libzstd.dll.a to make sure zstd is statically linked
   rm -f /ucrt64/lib/libzstd.dll.a
 }
@@ -46,6 +46,7 @@ build() {
 }
 
 collect() {
+  cp -af rust-out out
   cd out
 
   # Remove unused files

build.sh

@@ -55,11 +55,11 @@ build() {
 }
 
 collect() {
+  cp -af rust-out out
   cd out
+
   find . -name '*.old' -delete
   cp -af ../rust/build/$TRIPLE/llvm/bin llvm-bin
-  cp -af lib/rustlib/$TRIPLE/bin/rust-lld llvm-bin/lld
-  ln -sf lld llvm-bin/ld
   find ../rust/build/$TRIPLE/llvm/lib -name "*.${DYN_EXT}*" -exec cp -an {} lib \;
   local lib_llvm="libLLVM.${DYN_EXT}"
   if [ -L "lib/$lib_llvm" ]; then

common.sh

@@ -140,7 +140,6 @@ run_cmd() {
       ;;
     collect)
       rm -rf out
-      cp -af rust-out out
       collect
       ;;
     ndk)
@@ -158,7 +157,6 @@ run_cmd() {
       ;;
     *)
       echo "Unknown action \"$1\""
-      echo "./build.sh clone/build/ndk/dist"
       exit 1
       ;;
   esac