From 0f1714fbd7d30494f94c35242e7b70a50633ab53 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sun, 27 Sep 2026 10:23:36 +0700 Subject: [PATCH] Fix llvm miscompilation cross arch --- recipes/dev/llvm21/recipe.toml | 1 + src/cook/script.rs | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes/dev/llvm21/recipe.toml b/recipes/dev/llvm21/recipe.toml index ce29e47b9..5c5736fdf 100644 --- a/recipes/dev/llvm21/recipe.toml +++ b/recipes/dev/llvm21/recipe.toml @@ -60,6 +60,7 @@ COOKBOOK_CMAKE_FLAGS+=( -DLLVM_BUILD_EXAMPLES=Off -DLLVM_BUILD_TESTS=Off -DLLVM_DEFAULT_TARGET_TRIPLE="${TARGET}" + -DLLVM_HOST_TRIPLE="${TARGET}" -DLLVM_ENABLE_LTO=Off -DLLVM_ENABLE_RTTI=On -DLLVM_ENABLE_THREADS=On diff --git a/src/cook/script.rs b/src/cook/script.rs index a1f177847..f7e5765df 100644 --- a/src/cook/script.rs +++ b/src/cook/script.rs @@ -234,12 +234,12 @@ function generate_cookbook_cmake_file { gcc_prefix=$2 sysroot=$3 file=$4 - ARCH=$(echo "$target" | cut -d - -f1) + arch=$(echo "$target" | cut -d - -f1) if [[ "$target" == *"-linux-"* ]]; then - SYSTEM_NAME="Linux" + system_name="Linux" else - SYSTEM_NAME="UnixPaths" + system_name="UnixPaths" fi if [[ "$REDOXER_USE_CLANG" != "1" && "$REDOXER_USE_CLANG" != "true" ]]; then @@ -278,8 +278,8 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1) set(CMAKE_PREFIX_PATH, ${sysroot}) set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -set(CMAKE_SYSTEM_NAME ${SYSTEM_NAME}) -set(CMAKE_SYSTEM_PROCESSOR ${ARCH}) +set(CMAKE_SYSTEM_NAME ${system_name}) +set(CMAKE_SYSTEM_PROCESSOR ${arch}) EOF if [ "$target" = "$GNU_TARGET" ]