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

Fix 32-bit winegcc call on Linux when using LLD #5878

Merged
merged 3 commits into from
Jan 10, 2021
Merged

Fix 32-bit winegcc call on Linux when using LLD #5878

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d94852b
Fix 32-bit winegcc call on Linux when using LLD
rdrpenguin04 Jan 9, 2021
3e69320
I contributed!
rdrpenguin04 Jan 9, 2021
caf3ec5
Let the autogenerated file get autogenerated
rdrpenguin04 Jan 10, 2021
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
3 changes: 2 additions & 1 deletion cmake/modules/winegcc_wrapper.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ extra_args="-I@WINE_INCLUDE_DIR@ -I@WINE_INCLUDE_DIR@/wine/windows"
extra_args="$extra_args @WINE_CXX_FLAGS@"

# Apply -m32 library fix if necessary
# Additionally, apply "-z notext" to fix an inconsistency in ld.lld vs ld.bfd and ld.gold
if [ "$win32" = true ] && [ "$no_link" != true ]; then
extra_args="$extra_args @WINE_32_FLAGS@"
extra_args="$extra_args @WINE_32_FLAGS@ -z notext"
fi

# Apply -m64 library fix if necessary
Expand Down