git: 15d69b812239 - 2023Q3 - games/punchy: unbreak build on i386
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 02 Sep 2023 23:29:18 UTC
The branch 2023Q3 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=15d69b812239ce185c2a6232b69c5ff95c4df0da
commit 15d69b812239ce185c2a6232b69c5ff95c4df0da
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-07-11 05:18:21 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-09-02 23:29:09 +0000
games/punchy: unbreak build on i386
fatal runtime error: Rust cannot catch foreign exceptions
thread '<unnamed>' panicked at '/wrkdirs/usr/ports/lang/rust/work/rustc-1.70.0-src/compiler/rustc_codegen_ssa/src/back/write.rs:1535:21: worker thread panicked', compiler/rustc_middle/src/util/bug.rs:36:26
(signal: 6, SIGABRT: process abort signal)
Reported by: pkg-fallout
(cherry picked from commit ad1d79583b285d7a320f7a8b844bc568142670e0)
---
games/punchy/Makefile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/games/punchy/Makefile b/games/punchy/Makefile
index 8e1fe489fc11..1ceaa1a65cc0 100644
--- a/games/punchy/Makefile
+++ b/games/punchy/Makefile
@@ -30,6 +30,12 @@ CARGO_ENV+= V8_FROM_SOURCE=1 CLANG_BASE_PATH="/usr" GN_ARGS='${GN_ARGS}'
GN_ARGS+= use_custom_libcxx=false
CXXFLAGS+= ${${ARCH} == aarch64 && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160:?-Wno-enum-constexpr-conversion:}
+.if ${MACHINE_ARCH} == i386
+# https://github.com/rust-lang/rust/issues/85598
+LTO_UNSAFE= yes
+CARGO_ENV+= CARGO_PROFILE_RELEASE_LTO=false
+.endif
+
post-patch:
# Search assets under PREFIX instead of current directory
@${REINPLACE_CMD} 's,assets",../${DATADIR_REL}/&,' \