From 80773c333dbee6469b7527111f8f9d06094d260c Mon Sep 17 00:00:00 2001
From: Wildan Mubarok <willnode@wellosoft.net>
Date: Mon, 7 Jul 2025 19:10:52 +0000
Subject: [PATCH 1/2] Simplify llvm18 recipe

---
 recipes/dev/llvm18/recipe.toml | 50 +++++++++++++++-------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/recipes/dev/llvm18/recipe.toml b/recipes/dev/llvm18/recipe.toml
index 7b34605e1..b2592195a 100644
--- a/recipes/dev/llvm18/recipe.toml
+++ b/recipes/dev/llvm18/recipe.toml
@@ -11,32 +11,29 @@ dependencies = [
 script = """
 DYNAMIC_INIT
 
-cat > CMakeToolchain-x86_64.cmake <<EOF
-set(CMAKE_SYSTEM_NAME UnixPaths)
-set(CMAKE_FIND_ROOT_PATH ${COOKBOOK_SYSROOT})
-set(CMAKE_C_COMPILER ${TARGET}-gcc)
-set(CMAKE_CXX_COMPILER ${TARGET}-g++)
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
-set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
-EOF
+# https://llvm.org/docs/CMake.html
+case "${TARGET}" in
+    x86-unknown-redox)
+        LLVM_TARGETS_TO_BUILD="X86"
+        ;;
+    x86_64-unknown-redox)
+        LLVM_TARGETS_TO_BUILD="X86"
+        ;;
+    aarch64-unknown-redox)
+        LLVM_TARGETS_TO_BUILD="AArch64"
+        ;;
+    riscv64gc-unknown-redox)
+        LLVM_TARGETS_TO_BUILD="RISCV"
+        ;;
+    *)
+        LLVM_TARGETS_TO_BUILD="host"
+        ;;
+esac
 
 export LDFLAGS="-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib $LDFLAGS"
 
-COOKBOOK_MAKE="ninja"
-COOKBOOK_CONFIGURE_FLAGS=(
-    -GNinja
-    -DCMAKE_TOOLCHAIN_FILE=./CMakeToolchain-x86_64.cmake
-    -DCMAKE_AR="$(which "${TARGET}-ar")"
-    -DCMAKE_BUILD_TYPE=Release
-    -DCMAKE_CROSSCOMPILING=True
+COOKBOOK_CMAKE_FLAGS=(
     -DCMAKE_CXX_FLAGS="--std=gnu++11"
-    -DCMAKE_RANLIB="$(which "${TARGET}-ranlib")"
-    -DCMAKE_INSTALL_PREFIX="/usr"
-    -DCMAKE_INSTALL_INCLUDEDIR="include"
-    -DCMAKE_INSTALL_OLDINCLUDEDIR="/include"
     -DLLVM_LINK_LLVM_DYLIB=On
     -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE=$(realpath "${COOKBOOK_RECIPE}/native.cmake")"
     -DLLVM_BUILD_BENCHMARKS=Off
@@ -54,7 +51,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
     -DLLVM_INCLUDE_UTILS=Off
     -DLLVM_OPTIMIZED_TABLEGEN=On
     -DLLVM_TARGET_ARCH="$(echo "${TARGET}" | cut -d - -f1)"
-    -DLLVM_TARGETS_TO_BUILD=X86 # TODO: get from TARGET
+    -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD}"
     -DLLVM_TOOL_LLVM_COV_BUILD=Off
     -DLLVM_TOOL_LLVM_LTO_BUILD=Off
     -DLLVM_TOOL_LLVM_LTO2_BUILD=Off
@@ -67,12 +64,9 @@ COOKBOOK_CONFIGURE_FLAGS=(
     -DLLVM_UTILS_INSTALL_DIR=bin
     -DUNIX=1
     -DLLVM_ENABLE_PROJECTS="llvm"
-    -Wno-dev
-    "${COOKBOOK_SOURCE}/llvm"
 )
+
 set -x
-cmake "${COOKBOOK_CONFIGURE_FLAGS[@]}"
-ninja -j"${COOKBOOK_MAKE_JOBS}"
-DESTDIR="${COOKBOOK_STAGE}" ninja install -j"${COOKBOOK_MAKE_JOBS}"
+cookbook_cmake "${COOKBOOK_SOURCE}/llvm"
 set +x
 """

From c5d02fa039f95800e048d9aef9057258be705e07 Mon Sep 17 00:00:00 2001
From: Wildan Mubarok <willnode@wellosoft.net>
Date: Mon, 7 Jul 2025 20:14:05 +0000
Subject: [PATCH 2/2] Fix compilation

---
 recipes/dev/llvm18/recipe.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/dev/llvm18/recipe.toml b/recipes/dev/llvm18/recipe.toml
index b2592195a..d6cd8458a 100644
--- a/recipes/dev/llvm18/recipe.toml
+++ b/recipes/dev/llvm18/recipe.toml
@@ -34,6 +34,7 @@ export LDFLAGS="-Wl,-rpath-link,${COOKBOOK_SYSROOT}/lib $LDFLAGS"
 
 COOKBOOK_CMAKE_FLAGS=(
     -DCMAKE_CXX_FLAGS="--std=gnu++11"
+    -DBUILD_SHARED_LIBS=False
     -DLLVM_LINK_LLVM_DYLIB=On
     -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE=$(realpath "${COOKBOOK_RECIPE}/native.cmake")"
     -DLLVM_BUILD_BENCHMARKS=Off