X-Git-Url: http://gitweb/?a=blobdiff_plain;f=llvm%2FPkgfile;h=34fba748fec8237b44b2802cdd57bdf0f808fc47;hb=0442cdbe9cfa943840e3f8b52caa9a3fd663817c;hp=d38736c771d4698d6a2bc554e8a86c0117e5a564;hpb=26ea8ba0ed2e693e267852617e66374f506bf6a8;p=ports%2Fopt-arm64.git

diff --git a/llvm/Pkgfile b/llvm/Pkgfile
index d38736c..34fba74 100644
--- a/llvm/Pkgfile
+++ b/llvm/Pkgfile
@@ -1,10 +1,10 @@
 # Description: LLVM compiler backend
-# URL:         http://llvm.org/
-# Maintainer:  Thomas Penteker, tek at serverop dot de
-# Depends on:  cmake libffi libxml2 ninja
+# URL: http://llvm.org/
+# Maintainer: Thomas Penteker, tek at serverop dot de
+# Depends on: cmake libxml2 ninja
 
 name=llvm
-version=8.0.1
+version=12.0.1
 release=1
 source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/$name-$version.src.tar.xz
   llvm-config.h)
@@ -13,30 +13,25 @@ build() {
   export CC=gcc
   export CXX=g++
 
-  cd $name-$version.src
-
-  mkdir build
-  cd build
-
-  cmake .. -G Ninja \
-    -DLLVM_PARALLEL_COMPILE_JOBS="${JOBS:-1}" \
-    -DLLVM_ENABLE_CXX1Y=1 \
-    -DLLVM_INCLUDE_EXAMPLES=0 \
-    -DLLVM_INCLUDE_TESTS=0 \
-    -DLLVM_ENABLE_FFI=1 \
-    -DLLVM_ENABLE_RTTI=1 \
-    -DLLVM_ENABLE_OCAMLDOC=0 \
-    -DLLVM_TARGETS_TO_BUILD='AArch64' \
-    -DLLVM_BUILD_LLVM_DYLIB=1 \
-    -DLLVM_LINK_LLVM_DYLIB=1 \
-    -DLLVM_INSTALL_UTILS=1 \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLLVM_APPEND_VC_REV=0 \
+  cmake -S $name-$version.src -B build -G Ninja \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    -D CMAKE_BUILD_TYPE=Release \
+    -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+    -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+    -D LLVM_TARGETS_TO_BUILD='AArch64' \
+    -D LLVM_BUILD_LLVM_DYLIB=1 \
+    -D LLVM_LINK_LLVM_DYLIB=1 \
+    -D LLVM_PARALLEL_COMPILE_JOBS="${JOBS:-1}" \
+    -D LLVM_INCLUDE_EXAMPLES=0 \
+    -D LLVM_INCLUDE_TESTS=0 \
+    -D LLVM_ENABLE_FFI=1 \
+    -D LLVM_ENABLE_RTTI=1 \
+    -D LLVM_ENABLE_OCAMLDOC=0 \
+    -D LLVM_INSTALL_UTILS=1 \
     -Wno-dev
 
-  ninja
-  DESTDIR=$PKG ninja install
+  cmake --build build
+  DESTDIR=$PKG cmake --install build
 
   # multilib stub
   mv $PKG/usr/include/llvm/Config/llvm-config{,-64}.h