From ca1764105978cddab6815c08cf467c2c1779681a Mon Sep 17 00:00:00 2001 From: Ray Redondo Date: Sat, 9 Jan 2021 22:28:54 -0600 Subject: [PATCH] Fix 32-bit winegcc call on Linux when using LLD (#5878) --- cmake/modules/winegcc_wrapper.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/modules/winegcc_wrapper.in b/cmake/modules/winegcc_wrapper.in index 7677e4c37..7afd1995b 100755 --- a/cmake/modules/winegcc_wrapper.in +++ b/cmake/modules/winegcc_wrapper.in @@ -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