From dd97ff403bb8036b5fd4c75ed1d07151750289f8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 11 Oct 2021 23:30:15 +0200 Subject: [PATCH] Force the i386 triple -DLLVM_HOST_TRIPLE=i386-linux-gnu Sometimes, on i386, the library detection is failing (often on z3 or ffi) 'Could NOT find Z3:' --- debian/changelog | 4 ++++ debian/rules | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 859e4856..de73c4a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ llvm-toolchain-snapshot (1:14~++20211002060945+9452ec722ce0-1~exp1) experimental * Adjust the libomp_start_tool visibility on armhf * Be more flexible to install libomptarget-*.bc (ex: libomptarget-new-nvptx-*.bc are new) + * Force the i386 triple -DLLVM_HOST_TRIPLE=i386-linux-gnu + Sometimes, on i386, the library detection is failing (often on z3 + or ffi) + 'Could NOT find Z3:' -- Sylvestre Ledru Sat, 02 Oct 2021 18:15:52 +0200 diff --git a/debian/rules b/debian/rules index 2d58de9a..6dc3c880 100755 --- a/debian/rules +++ b/debian/rules @@ -130,6 +130,13 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armhf)) CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=armv7l-unknown-linux-gnueabihf endif +ifneq (,$(filter $(DEB_HOST_ARCH),i386)) +# Sometimes, i386 needs help with the triple + CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu +endif + + + ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) # avoid an issue with search path on mips64el # https://bugs.llvm.org/show_bug.cgi?id=41204