Skip to content

Commit 6d57469

Browse files
committed
Merge branch 'eimytdl/otp28-wx-crashes/OTP-19724' into maint
2 parents cbe4df5 + 5510216 commit 6d57469

2 files changed

Lines changed: 18 additions & 0 deletions

File tree

lib/wx/configure

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6182,6 +6182,14 @@ fi
61826182

61836183

61846184

6185+
case $host_os in
6186+
darwin*)
6187+
CFLAGS=`echo "$CFLAGS" | sed 's/-mbranch-protection=standard/ /g'`
6188+
;;
6189+
*)
6190+
;;
6191+
esac
6192+
61856193

61866194

61876195
if test "X$windows_environment_" != "Xchecked"; then

lib/wx/configure.ac

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,16 @@ WXERL_CAN_BUILD_DRIVER=true
9393

9494
ERL_OSSF_FLAGS
9595

96+
case $host_os in
97+
darwin*)
98+
dnl For Darwin (MacOS) disable one hardening option which causes problems
99+
dnl with C++ catch, as it is necessary for the module to operate correctly
100+
CFLAGS=`echo "$CFLAGS" | sed 's/-mbranch-protection=standard/ /g'`
101+
;;
102+
*)
103+
;;
104+
esac
105+
96106
LM_WINDOWS_ENVIRONMENT
97107

98108
USER_CFLAGS=$CFLAGS

0 commit comments

Comments
 (0)