move make_win_llvm_dist up

Author: mati865

src/bootstrap/src/core/build_steps/dist.rs

@@ -295,6 +295,44 @@ fn make_win_dist(plat_root: &Path, target: TargetSelection, builder: &Builder<'_
     }
 }
 
+fn make_win_llvm_dist(plat_root: &Path, target: TargetSelection, builder: &Builder<'_>) {
+    if builder.config.dry_run() {
+        return;
+    }
+
+    let (_, lib_path) = get_cc_search_dirs(target, builder);
+
+    // Libraries necessary to link the windows-gnullvm toolchains.
+    // System libraries will be preferred if they are available (see #67429).
+    let target_libs = [
+        // MinGW libs
+        "libunwind.a",
+        "libunwind.dll.a",
+        "libmingw32.a",
+        "libmingwex.a",
+        "libmsvcrt.a",
+        // Windows import libs, remove them once std transitions to raw-dylib
+        "libkernel32.a",
+        "libuser32.a",
+        "libntdll.a",
+        "libuserenv.a",
+        "libws2_32.a",
+        "libdbghelp.a",
+    ];
+
+    //Find mingw artifacts we want to bundle
+    let target_libs = find_files(&target_libs, &lib_path);
+
+    //Copy platform libs to platform-specific lib directory
+    let plat_target_lib_self_contained_dir =
+        plat_root.join("lib/rustlib").join(target).join("lib/self-contained");
+    fs::create_dir_all(&plat_target_lib_self_contained_dir)
+        .expect("creating plat_target_lib_self_contained_dir failed");
+    for src in target_libs {
+        builder.copy_link_to_folder(&src, &plat_target_lib_self_contained_dir);
+    }
+}
+
 fn runtime_dll_dist(rust_root: &Path, target: TargetSelection, builder: &Builder<'_>) {
     if builder.config.dry_run() {
         return;
@@ -344,44 +382,6 @@ fn runtime_dll_dist(rust_root: &Path, target: TargetSelection, builder: &Builder
     }
 }
 
-fn make_win_llvm_dist(plat_root: &Path, target: TargetSelection, builder: &Builder<'_>) {
-    if builder.config.dry_run() {
-        return;
-    }
-
-    let (_, lib_path) = get_cc_search_dirs(target, builder);
-
-    // Libraries necessary to link the windows-gnullvm toolchains.
-    // System libraries will be preferred if they are available (see #67429).
-    let target_libs = [
-        // MinGW libs
-        "libunwind.a",
-        "libunwind.dll.a",
-        "libmingw32.a",
-        "libmingwex.a",
-        "libmsvcrt.a",
-        // Windows import libs, remove them once std transitions to raw-dylib
-        "libkernel32.a",
-        "libuser32.a",
-        "libntdll.a",
-        "libuserenv.a",
-        "libws2_32.a",
-        "libdbghelp.a",
-    ];
-
-    //Find mingw artifacts we want to bundle
-    let target_libs = find_files(&target_libs, &lib_path);
-
-    //Copy platform libs to platform-specific lib directory
-    let plat_target_lib_self_contained_dir =
-        plat_root.join("lib/rustlib").join(target).join("lib/self-contained");
-    fs::create_dir_all(&plat_target_lib_self_contained_dir)
-        .expect("creating plat_target_lib_self_contained_dir failed");
-    for src in target_libs {
-        builder.copy_link_to_folder(&src, &plat_target_lib_self_contained_dir);
-    }
-}
-
 fn get_cc_search_dirs(
     target: TargetSelection,
     builder: &Builder<'_>,