pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust: use system libunwind when building with external LLVM
Module Name: pkgsrc-wip
Committed By: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By: adam
Date: Thu Mar 3 11:34:16 2022 +0100
Changeset: 6e206f63835cc16e76b74168ecd6fcf67ded6e97
Modified Files:
rust/options.mk
Log Message:
rust: use system libunwind when building with external LLVM
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6e206f63835cc16e76b74168ecd6fcf67ded6e97
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust/options.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diffs:
diff --git a/rust/options.mk b/rust/options.mk
index 44b8dba9fb..cb1633b635 100644
--- a/rust/options.mk
+++ b/rust/options.mk
@@ -28,11 +28,11 @@ PKG_SUGGESTED_OPTIONS+= rust-cargo-static
#
.if empty(PKG_OPTIONS:Mrust-llvm)
BUILDLINK_API_DEPENDS.llvm+= llvm>=12.0.0
+.include "../../lang/libunwind/buildlink3.mk"
.include "../../lang/llvm/buildlink3.mk"
CONFIGURE_ARGS+= --enable-llvm-link-shared
+#CONFIGURE_ARGS+= --llvm-libunwind=system
CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm}
-# XXX: fix for Rust 1.41.0 https://github.com/rust-lang/rust/issues/68714
-MAKE_ENV+= LIBRARY_PATH=${BUILDLINK_PREFIX.llvm}/lib
.endif
#
Home |
Main Index |
Thread Index |
Old Index