Skip to content

Commit 89bae5e

Browse files
committed
wine: Fix building on i386 with mprotect enabled.
While here, fix GCC 14 build. Reported by 533k3R on unitedbsd.
1 parent 70a3cc0 commit 89bae5e

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

emulators/wine/Makefile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ GNU_CONFIGURE= yes
1919
REPLACE_PERL+= tools/winemaker/winemaker
2020
REPLACE_PERL+= tools/winedump/function_grep.pl
2121

22+
MKPIE_SUPPORTED= no
2223
CHECK_PIE_SUPPORTED= no
2324

2425
ONLY_FOR_PLATFORM+= *-*-i386 *-*-x86_64
@@ -61,6 +62,15 @@ CONFIGURE_ENV+= ac_cv_cflags__Wl___enable_new_dtags=no
6162
CONFIGURE_ENV+= wine_cv_linux_gethostbyname_r_6=no
6263
.endif
6364

65+
.include "../../mk/compiler.mk"
66+
67+
.if ${CC_VERSION:Mgcc-1*} || ${CC_VERSION:Mclang-*}
68+
CFLAGS+= -Wno-incompatible-pointer-types
69+
CFLAGS+= -Wno-implicit-function-declaration
70+
CXXFLAGS+= -Wno-incompatible-pointer-types
71+
CXXFLAGS+= -Wno-implicit-function-declaration
72+
.endif
73+
6474
.include "../../mk/oss.buildlink3.mk"
6575

6676
.if ${OSS_TYPE} != "none"

0 commit comments

Comments
 (0)