From 5dd8e0ef22b322a7c939e7bab2fd89f12cfba8c9 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Fri, 21 Jul 2023 14:16:13 -0500 Subject: [PATCH] Set LLVM_HOST_TRIPLE for all builds --- recipe/build.sh | 3 ++- recipe/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index a94efc40..00cab801 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -17,9 +17,10 @@ if [[ "$CC_FOR_BUILD" != "" && "$CC_FOR_BUILD" != "$CC" ]]; then NATIVE_FLAGS="${NATIVE_FLAGS};-DCMAKE_STATIC_LINKER_FLAGS=;-DLLVM_INCLUDE_BENCHMARKS=OFF" NATIVE_FLAGS="${NATIVE_FLAGS};-DLLVM_ENABLE_ZSTD=OFF;-DLLVM_ENABLE_LIBXML2=OFF;-DLLVM_ENABLE_ZLIB=OFF;" CMAKE_ARGS="${CMAKE_ARGS} -DCROSS_TOOLCHAIN_FLAGS_NATIVE=${NATIVE_FLAGS}" - CMAKE_ARGS="${CMAKE_ARGS} -DLLVM_HOST_TRIPLE=$(echo $HOST | sed s/conda/unknown/g) -DLLVM_DEFAULT_TARGET_TRIPLE=$(echo $HOST | sed s/conda/unknown/g)" fi +CMAKE_ARGS="${CMAKE_ARGS} -DLLVM_HOST_TRIPLE=${CONDA_TOOLCHAIN_HOST} -DLLVM_DEFAULT_TARGET_TRIPLE=${CONDA_TOOLCHAIN_HOST}" + # disable -fno-plt due to https://bugs.llvm.org/show_bug.cgi?id=51863 due to some GCC bug if [[ "$target_platform" == "linux-ppc64le" ]]; then CFLAGS="$(echo $CFLAGS | sed 's/-fno-plt //g')" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8ff21403..42a2d1db 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,7 @@ source: - patches/0003-restore-macos-10.9-support.patch build: - number: 0 + number: 1 merge_build_host: false requirements: