Skip to content

Commit 786da0f

Browse files
rdrpenguin04IanCaio
authored andcommitted
Fix 32-bit winegcc call on Linux when using LLD (LMMS#5878)
1 parent d8eb6a5 commit 786da0f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

cmake/modules/winegcc_wrapper.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ extra_args="-I@WINE_INCLUDE_DIR@ -I@WINE_INCLUDE_DIR@/wine/windows"
4949
extra_args="$extra_args @WINE_CXX_FLAGS@"
5050

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

5657
# Apply -m64 library fix if necessary

0 commit comments

Comments
 (0)