* update wasi-libc++ to 18.1.8-4

2024-10-05 12:17:22 +02:00 · 2024-10-05 12:17:22 +02:00 · 75660b637f
commit 75660b637f
parent 9a8ffb605b
2 changed files with 176 additions and 127 deletions
--- a/wasi-libc++/.SRCINFO
+++ b/wasi-libc++/.SRCINFO
@ -0,0 +1,36 @@
+pkgbase = wasi-libc++
+	pkgdesc = WASI LLVM C++ standard library
+	pkgver = 18.1.8
+	pkgrel = 4
+	url = https://libcxx.llvm.org/
+	arch = any
+	license = Apache-2.0 WITH LLVM-exception
+	makedepends = cmake
+	makedepends = ninja
+	makedepends = python
+	makedepends = clang
+	makedepends = llvm
+	makedepends = lld
+	makedepends = util-linux
+	depends = wasi-libc
+	depends = wasi-compiler-rt
+	options = !lto
+	options = staticlibs
+	options = !debug
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-project-18.1.8.src.tar.xz
+	source = https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-project-18.1.8.src.tar.xz.sig
+	source = WASI.cmake
+	source = wasi-sdk.cmake
+	validpgpkeys = 474E22316ABF4785A88C6E8EA2C794A986419D8A
+	b2sums = a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f
+	b2sums = SKIP
+	b2sums = c829d807c257921fddb8c4d3752ad2291a2beb116d414dd31e34b7f6b01599d8c4807db87ef9930456ed8c9f30e8648e77028fa0b903c3a5ea840514f6022cf4
+	b2sums = 0da3e98a7e09eb500a593f78f92a3b23238cf969be326e2711313f95daff39f8a890a7826b2526a81d8c22a035772ed420fddc2d6182f216be9b732755b94f8e
+
+pkgname = wasi-libc++
+	depends = wasi-libc
+	depends = wasi-compiler-rt
+	depends = wasi-libc++abi=18.1.8-4
+
+pkgname = wasi-libc++abi
+	pkgdesc = Low level support for the WASI LLVM C++ standard library
--- a/wasi-libc++/PKGBUILD
+++ b/wasi-libc++/PKGBUILD
@ -4,40 +4,49 @@
 pkgbase=wasi-libc++
 pkgname=(wasi-libc++ wasi-libc++abi)
 pkgver=18.1.8
-pkgrel=3
-arch=(any)
-url='https://libcxx.llvm.org/'
+pkgrel=4
+pkgdesc="WASI LLVM C++ standard library"
+url="https://libcxx.llvm.org/"
 license=('Apache-2.0 WITH LLVM-exception')
-makedepends=('cmake' 'ninja' 'python' 'clang' 'llvm' 'wasi-libc' 'wasi-compiler-rt' 'lld' 'util-linux')
-source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}/llvm-project-${pkgver}.src.tar.xz{,.sig}
+arch=(any)
+depends=('wasi-libc' 'wasi-compiler-rt')
+makedepends=('cmake' 'ninja' 'python' 'clang' 'llvm' 'lld' 'util-linux')
+source=("https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/llvm-project-$pkgver.src.tar.xz"{,.sig}
        WASI.cmake
        wasi-sdk.cmake)
 b2sums=('a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f'
        'SKIP'
        'c829d807c257921fddb8c4d3752ad2291a2beb116d414dd31e34b7f6b01599d8c4807db87ef9930456ed8c9f30e8648e77028fa0b903c3a5ea840514f6022cf4'
        '0da3e98a7e09eb500a593f78f92a3b23238cf969be326e2711313f95daff39f8a890a7826b2526a81d8c22a035772ed420fddc2d6182f216be9b732755b94f8e')
-options=('staticlibs' '!lto' '!debug')
-validpgpkeys=(
-  '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar@redhat.com>
-  #'D574BD5D1D0E98895E3BF90044F2485E45D59042' # Tobias Hieta <tobias@hieta.se>
-)
+options=('!lto' 'staticlibs' '!debug')
+validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>

 _targets=(wasm32-wasi wasm32-wasip1 wasm32-wasip1-threads wasm32-wasip2)

 prepare() {
-  # Platform files have been copied from here https://github.com/WebAssembly/wasi-sdk
-  mv llvm-project-${pkgver}.src llvm
-  mkdir -p llvm/cmake/Platform
-  cp WASI.cmake llvm/cmake/Platform
+  # Platform files have been copied from
+  # https://github.com/WebAssembly/wasi-sdk
+
+  mkdir -p llvm-project-$pkgver.src/cmake/Platform
+  cp WASI.cmake llvm-project-$pkgver.src/cmake/Platform
 }

 build() {
-  # Build options are derived from here https://github.com/WebAssembly/wasi-sdk/blob/main/Makefile
+  # Build options are derived from
+  # https://github.com/WebAssembly/wasi-sdk/blob/main/Makefile
+
  # remove compiler options not supported by the wasm32-wasi target
-  export CFLAGS="$(echo $CFLAGS | sed "s/-mtune=generic//;
-  s/-fstack-clash-protection//; s/-fcf-protection//; s/-fexceptions//; s/-march=x86-64; s/-mcpu=[a-z0-9]+//")"
-  export CXXFLAGS="$(echo $CXXFLAGS | sed "s/-mtune=generic//;
-  s/-fstack-clash-protection//; s/-fcf-protection//; s/-fexceptions//; s/-march=x86-64/; s/-mcpu=[a-z0-9]+ //")"
+  local sanitize_flags=(
+    -r
+    -e 's/-fcf-protection ?//'
+    -e 's/-fexceptions ?//'
+    -e 's/-fstack-clash-protection ?//'
+    -e 's/-march=x86-64 ?//'
+    -e 's/-mtune=generic ?//'
+    -e 's/-mcpu=[a-z0-9]+ ?//'
+  )
+  CFLAGS="$(<<<"$CFLAGS" sed "${sanitize_flags[@]}")"
+  CXXFLAGS="$(<<<"$CXXFLAGS" sed "${sanitize_flags[@]}")"

  local target threads_flag threads_cflags
  for target in "${_targets[@]}"; do
@ -49,135 +58,139 @@ build() {
      threads_cflags=
    fi

-    cmake -B build-${target} -G Ninja \
-      -DCMAKE_C_COMPILER_WORKS=ON \
-      -DCMAKE_CXX_COMPILER_WORKS=ON \
-      -DCMAKE_AR=/usr/bin/ar \
-      -DCMAKE_TOOLCHAIN_FILE="${srcdir}"/wasi-sdk.cmake \
-      -DCMAKE_STAGING_PREFIX=/usr/share/wasi-sysroot \
-      -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF \
-      -DLIBCXX_ENABLE_THREADS:BOOL=${threads_flag} \
-      -DLIBCXX_HAS_PTHREAD_API:BOOL=${threads_flag} \
-      -DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
-      -DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
-      -DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF \
-      -DLLVM_COMPILER_CHECKED:BOOL=ON \
-      -DLLVM_RUNTIMES_LINKING_WORKS:BOOL=ON \
-      -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR:BOOL=ON \
-      -DLLVM_DEFAULT_TARGET_TRIPLE=${target} \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DLIBCXX_ENABLE_SHARED:BOOL=OFF \
-      -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF \
-      -DLIBCXX_ENABLE_FILESYSTEM:BOOL=ON \
-      -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT:BOOL=OFF \
-      -DLIBCXX_CXX_ABI=libcxxabi \
-      -DLIBCXX_HAS_MUSL_LIBC:BOOL=ON \
-      -DLIBCXX_ABI_VERSION=2 \
-      -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF \
-      -DLIBCXXABI_ENABLE_SHARED:BOOL=OFF \
-      -DLIBCXXABI_SILENT_TERMINATE:BOOL=ON \
-      -DLIBCXXABI_ENABLE_THREADS:BOOL=${threads_flag} \
-      -DLIBCXXABI_HAS_PTHREAD_API:BOOL=${threads_flag} \
-      -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
-      -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
-      -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
-      -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF \
-      -DWASI_SDK_PREFIX=/usr \
-      -DUNIX:BOOL=ON \
-      -DCMAKE_SYSROOT=/usr/share/wasi-sysroot \
-      -DCMAKE_C_FLAGS="${CFLAGS} ${threads_cflags} --target=${target}" \
-      -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${threads_cflags} --target=${target}" \
-      -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
-      -DCXX_SUPPORTS_CLASS_MEMACCESS_FLAG:BOOL=OFF \
-      -DCXX_SUPPORTS_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_CXX11:BOOL=ON \
-      -DCXX_SUPPORTS_EHA_FLAG:BOOL=OFF \
-      -DCXX_SUPPORTS_EHS_FLAG:BOOL=OFF \
-      -DCXX_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_FDATA_SECTIONS:BOOL=ON \
-      -DCXX_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_FSTRICT_ALIASING_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_IMPLICIT_FALLTHROUGH_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_MISLEADING_INDENTATION_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_MISSING_FIELD_INITIALIZERS_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_NOEXCEPT_TYPE_FLAG:BOOL=OFF \
-      -DCXX_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_PEDANTIC_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_STRING_CONVERSION_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_UNWINDLIB_EQ_NONE_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WALL_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WCHAR_SUBSCRIPTS_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WCONVERSION_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WERROR_DATE_TIME:BOOL=ON \
-      -DCXX_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WERROR_UNGUARDED_AVAILABILITY_NEW:BOOL=ON \
-      -DCXX_SUPPORTS_WEXTRA_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WFORMAT_NONLITERAL_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WMISMATCHED_TAGS_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WMISSING_BRACES_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WNEWLINE_EOF_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WNO_ERROR_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WNO_USER_DEFINED_LITERALS_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WSHADOW_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WSHORTEN_64_TO_32_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WSIGN_COMPARE_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WSIGN_CONVERSION_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WSTRICT_ALIASING_EQ_2_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WSTRICT_OVERFLOW_EQ_4_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WUNDEF_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WUNUSED_FUNCTION_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WUNUSED_PARAMETER_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WUNUSED_VARIABLE_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON \
-      -DCXX_SUPPORTS_WX_FLAG:BOOL=OFF \
-      -DCXX_SUPPORTS_W_FLAG:BOOL=ON \
-      -DCXX_WONT_WARN_ON_FINAL_NONVIRTUALDTOR:BOOL=ON \
-      -DCXX_WSUGGEST_OVERRIDE_ALLOWS_ONLY_FINAL:BOOL=ON \
-      -DLINKER_SUPPORTS_COLOR_DIAGNOSTICS:BOOL=ON \
-      -DSUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON \
-      llvm/runtimes
+    local cmake_options=(
+      -S llvm-project-$pkgver.src/runtimes
+      -B build-$target
+      -G Ninja
+      -DCMAKE_C_COMPILER_WORKS=ON
+      -DCMAKE_CXX_COMPILER_WORKS=ON
+      -DCMAKE_AR=/usr/bin/ar
+      -DCMAKE_TOOLCHAIN_FILE="$srcdir/wasi-sdk.cmake"
+      -DCMAKE_STAGING_PREFIX=/usr/share/wasi-sysroot
+      -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF
+      -DLIBCXX_ENABLE_THREADS:BOOL=$threads_flag
+      -DLIBCXX_HAS_PTHREAD_API:BOOL=$threads_flag
+      -DLIBCXX_HAS_EXTERNAL_THREAD_API:BOOL=OFF
+      -DLIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
+      -DLIBCXX_HAS_WIN32_THREAD_API:BOOL=OFF
+      -DLLVM_COMPILER_CHECKED:BOOL=ON
+      -DLLVM_RUNTIMES_LINKING_WORKS:BOOL=ON
+      -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR:BOOL=ON
+      -DLLVM_DEFAULT_TARGET_TRIPLE=$target
+      -DCMAKE_BUILD_TYPE=Release
+      -DLIBCXX_ENABLE_SHARED:BOOL=OFF
+      -DLIBCXX_ENABLE_EXCEPTIONS:BOOL=OFF
+      -DLIBCXX_ENABLE_FILESYSTEM:BOOL=ON
+      -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT:BOOL=OFF
+      -DLIBCXX_CXX_ABI=libcxxabi
+      -DLIBCXX_HAS_MUSL_LIBC:BOOL=ON
+      -DLIBCXX_ABI_VERSION=2
+      -DLIBCXXABI_ENABLE_EXCEPTIONS:BOOL=OFF
+      -DLIBCXXABI_ENABLE_SHARED:BOOL=OFF
+      -DLIBCXXABI_SILENT_TERMINATE:BOOL=ON
+      -DLIBCXXABI_ENABLE_THREADS:BOOL=$threads_flag
+      -DLIBCXXABI_HAS_PTHREAD_API:BOOL=$threads_flag
+      -DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF
+      -DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF
+      -DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF
+      -DLIBCXXABI_USE_LLVM_UNWINDER:BOOL=OFF
+      -DWASI_SDK_PREFIX=/usr
+      -DUNIX:BOOL=ON
+      -DCMAKE_SYSROOT=/usr/share/wasi-sysroot
+      -DCMAKE_C_FLAGS="$CFLAGS $threads_cflags --target=$target"
+      -DCMAKE_CXX_FLAGS="$CXXFLAGS $threads_cflags --target=$target"
+      -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi"
+      -DCXX_SUPPORTS_CLASS_MEMACCESS_FLAG:BOOL=OFF
+      -DCXX_SUPPORTS_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_CXX11:BOOL=ON
+      -DCXX_SUPPORTS_EHA_FLAG:BOOL=OFF
+      -DCXX_SUPPORTS_EHS_FLAG:BOOL=OFF
+      -DCXX_SUPPORTS_FALIGNED_ALLOCATION_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_FDATA_SECTIONS:BOOL=ON
+      -DCXX_SUPPORTS_FNO_EXCEPTIONS_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_FSTRICT_ALIASING_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_FVISIBILITY_EQ_HIDDEN_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_IMPLICIT_FALLTHROUGH_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_MISLEADING_INDENTATION_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_MISSING_FIELD_INITIALIZERS_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_NOEXCEPT_TYPE_FLAG:BOOL=OFF
+      -DCXX_SUPPORTS_NOSTDINCXX_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_NOSTDLIBXX_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_PEDANTIC_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_STRING_CONVERSION_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_UNWINDLIB_EQ_NONE_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WALL_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WCHAR_SUBSCRIPTS_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WCONVERSION_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WERROR_DATE_TIME:BOOL=ON
+      -DCXX_SUPPORTS_WERROR_EQ_RETURN_TYPE_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WERROR_UNGUARDED_AVAILABILITY_NEW:BOOL=ON
+      -DCXX_SUPPORTS_WEXTRA_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WEXTRA_SEMI_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WFORMAT_NONLITERAL_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WMISMATCHED_TAGS_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WMISSING_BRACES_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WNEWLINE_EOF_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WNO_COVERED_SWITCH_DEFAULT_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WNO_ERROR_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WNO_LONG_LONG_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WNO_SUGGEST_OVERRIDE_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WNO_UNUSED_PARAMETER_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WNO_USER_DEFINED_LITERALS_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WSHADOW_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WSHORTEN_64_TO_32_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WSIGN_COMPARE_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WSIGN_CONVERSION_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WSTRICT_ALIASING_EQ_2_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WSTRICT_OVERFLOW_EQ_4_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WUNDEF_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WUNUSED_FUNCTION_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WUNUSED_PARAMETER_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WUNUSED_VARIABLE_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WWRITE_STRINGS_FLAG:BOOL=ON
+      -DCXX_SUPPORTS_WX_FLAG:BOOL=OFF
+      -DCXX_SUPPORTS_W_FLAG:BOOL=ON
+      -DCXX_WONT_WARN_ON_FINAL_NONVIRTUALDTOR:BOOL=ON
+      -DCXX_WSUGGEST_OVERRIDE_ALLOWS_ONLY_FINAL:BOOL=ON
+      -DLINKER_SUPPORTS_COLOR_DIAGNOSTICS:BOOL=ON
+      -DSUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG:BOOL=ON
+    )

-      ninja -C build-${target} cxx cxxabi
-    done
+    cmake "${cmake_options[@]}"
+    ninja -C build-$target cxx cxxabi
+  done
 }

 # Do not remove the space before the () or commitpkg will
 # accidentally to run this function on the system (!!!)
 package_wasi-libc++ () {
-  pkgdesc='WASI LLVM C++ standard library'
+  depends+=("wasi-libc++abi=$pkgver-$pkgrel")

  local target
  for target in "${_targets[@]}"; do
-    DESTDIR="${pkgdir}" ninja -C build-${target} install-cxx
+    DESTDIR="$pkgdir" ninja -C build-$target install-cxx
  done

  # reduce duplication
-  hardlink -c "${pkgdir}"/usr/share/wasi-sysroot
+  hardlink -c "$pkgdir/usr/share/wasi-sysroot"

-  install -Dm0644 llvm/libcxx/CREDITS.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/CREDITS
-  install -Dm0644 llvm/libcxx/LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm0644 llvm-project-$pkgver.src/libcxx/CREDITS.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/CREDITS
+  install -Dm0644 llvm-project-$pkgver.src/libcxx/LICENSE.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
 }

 package_wasi-libc++abi() {
-  pkgdesc='WASI Low level support for the LLVM C++ standard library.'
+  pkgdesc="Low level support for the $pkgdesc"

  local target
  for target in "${_targets[@]}"; do
-    DESTDIR="${pkgdir}" ninja -C build-${target} install-cxxabi
+    DESTDIR="$pkgdir" ninja -C build-$target install-cxxabi
  done

  # reduce duplication
-  hardlink -c "${pkgdir}"/usr/share/wasi-sysroot
+  hardlink -c "$pkgdir/usr/share/wasi-sysroot"

-  install -Dm0644 llvm/libcxxabi/CREDITS.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/CREDITS
-  install -Dm0644 llvm/libcxxabi/LICENSE.TXT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm0644 llvm-project-$pkgver.src/libcxxabi/CREDITS.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/CREDITS
+  install -Dm0644 llvm-project-$pkgver.src/libcxxabi/LICENSE.TXT "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
 }