Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing windres.exe dependencies to Windows distribution #25030

Closed
wants to merge 1 commit into from
Closed

Add missing windres.exe dependencies to Windows distribution #25030

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/etc/make-win-dist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-"):
Expand Down Expand Up @@ -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)

Expand All @@ -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
Expand Down