From a3631b096482bbc1e1c920e15fb84fe12034be61 Mon Sep 17 00:00:00 2001 From: gentoo90 Date: Fri, 1 May 2015 18:50:42 +0300 Subject: [PATCH] Add missing `windres.exe` dependencies to Windows distribution `windres.exe` cannot compile `*.rc` files into `*.res` or `*.o` files without `cc1.exe`, which it uses as a preprocessor. --- src/etc/make-win-dist.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/etc/make-win-dist.py b/src/etc/make-win-dist.py index defda27acc9ec..166a69c2a123f 100644 --- a/src/etc/make-win-dist.py +++ b/src/etc/make-win-dist.py @@ -45,7 +45,8 @@ def make_win_dist(rust_root, gcc_root, target_triple): elif key == "libraries": lib_path.extend(val.lstrip(' =').split(';')) - target_tools = ["gcc.exe", "ld.exe", "ar.exe", "dlltool.exe", "windres.exe"] + target_tools = ["gcc.exe", "ld.exe", "ar.exe", "dlltool.exe", "windres.exe", "cc1.exe"] + target_dlls = ["libgmp-10.dll", "libwinpthread-1.dll", "zlib1.dll"] rustc_dlls = ["libstdc++-6.dll"] if target_triple.startswith("i686-"): @@ -98,6 +99,7 @@ def make_win_dist(rust_root, gcc_root, target_triple): # Find mingw artifacts we want to bundle target_tools = find_files(target_tools, bin_path) + target_dlls = find_files(target_dlls, bin_path) rustc_dlls = find_files(rustc_dlls, bin_path) target_libs = find_files(target_libs, lib_path) @@ -110,7 +112,7 @@ def make_win_dist(rust_root, gcc_root, target_triple): target_bin_dir = os.path.join(gcc_root, "bin", "rustlib", target_triple, "bin") if not os.path.exists(target_bin_dir): os.makedirs(target_bin_dir) - for src in target_tools: + for src in target_tools + target_dlls: shutil.copy(src, target_bin_dir) # Copy platform libs to platform-specific lib directory