From ef700fb4e57721278edbfb0946d42e59d852168c Mon Sep 17 00:00:00 2001
From: Malcolm Smith <smith@chaquo.com>
Date: Sat, 16 Dec 2023 22:53:52 +0000
Subject: [PATCH] chaquopy-llvm WIP

---
 server/pypi/packages/chaquopy-llvm/build-tblgen.sh |  2 +-
 server/pypi/packages/chaquopy-llvm/build.sh        | 10 ++++------
 server/pypi/packages/chaquopy-llvm/meta.yaml       |  4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/server/pypi/packages/chaquopy-llvm/build-tblgen.sh b/server/pypi/packages/chaquopy-llvm/build-tblgen.sh
index d42ac05bf5..0d9c07d9de 100755
--- a/server/pypi/packages/chaquopy-llvm/build-tblgen.sh
+++ b/server/pypi/packages/chaquopy-llvm/build-tblgen.sh
@@ -6,7 +6,7 @@ mkdir -p $build_dir
 cd $build_dir
 
 unset AR ARFLAGS AS CC CFLAGS CPP CPPFLAGS CXX CXXFLAGS F77 F90 FARCH FC LD LDFLAGS LDSHARED \
-      NM RANLIB READELF STRIP
+      NM RANLIB READELF STRIP CMAKE_TOOLCHAIN_FILE
 
 cmake -G Ninja ..
 cmake --build . --target llvm-tblgen -- -j $(nproc)
diff --git a/server/pypi/packages/chaquopy-llvm/build.sh b/server/pypi/packages/chaquopy-llvm/build.sh
index de0e494ce6..350bb1c030 100755
--- a/server/pypi/packages/chaquopy-llvm/build.sh
+++ b/server/pypi/packages/chaquopy-llvm/build.sh
@@ -8,8 +8,7 @@ set -eu
 # There are undefined symbols in plugin modules, e.g lib/Transforms/Hello.
 LDFLAGS=$(echo $LDFLAGS | sed 's/-Wl,--no-undefined//')
 
-triple=$(basename $AR | sed 's/-ar$//')
-case $triple in
+case $HOST in
     arm-linux-androideabi)
         target="ARM"
         ;;
@@ -23,7 +22,7 @@ case $triple in
         target="X86"
         ;;
     *)
-        echo "Unknown triple '$triple'"
+        echo "Unknown HOST '$HOST'"
         exit 1
 esac
 
@@ -38,11 +37,10 @@ _cmake_config+=(-DCMAKE_BUILD_TYPE:STRING=Release)
 _cmake_config+=(-DLLVM_BUILD_LLVM_DYLIB=ON)
 _cmake_config+=(-DLLVM_TABLEGEN=$(realpath $build_tblgen/bin/llvm-tblgen))
 
-_cmake_config+=(-DCMAKE_TOOLCHAIN_FILE="../chaquopy.toolchain.cmake")
-_cmake_config+=(-DLLVM_HOST_TRIPLE=$triple)
+_cmake_config+=(-DLLVM_HOST_TRIPLE=$HOST)
 _cmake_config+=(-DLLVM_TARGETS_TO_BUILD=$target)
 _cmake_config+=(-DLLVM_TARGET_ARCH=$target)
-_cmake_config+=(-DLLVM_DEFAULT_TARGET_TRIPLE=$triple)
+_cmake_config+=(-DLLVM_DEFAULT_TARGET_TRIPLE=$HOST)
 
 _cmake_config+=(-DLLVM_ENABLE_ASSERTIONS:BOOL=ON)
 _cmake_config+=(-DLINK_POLLY_INTO_TOOLS:BOOL=ON)
diff --git a/server/pypi/packages/chaquopy-llvm/meta.yaml b/server/pypi/packages/chaquopy-llvm/meta.yaml
index cc9d0ea7b3..83b73ab4f1 100644
--- a/server/pypi/packages/chaquopy-llvm/meta.yaml
+++ b/server/pypi/packages/chaquopy-llvm/meta.yaml
@@ -7,11 +7,11 @@ package:
   version: {{ version }}
 
 build:
-  number: 2
+  number: 3
 
 source:
   url: http://llvm.org/releases/{{ version }}/llvm-{{ version }}.src.tar.xz
 
 requirements:
   build:
-    - cmake
+    - cmake 3.28.1