From d212b98e6754a14218b3f04f089c6a2918d806be Mon Sep 17 00:00:00 2001 From: swap357 Date: Mon, 18 Aug 2025 09:49:13 -0700 Subject: [PATCH 1/3] disable RTTI on llvmdev and llvmdev_for_wheel recipes --- conda-recipes/llvmdev/bld.bat | 2 +- conda-recipes/llvmdev/build.sh | 2 +- conda-recipes/llvmdev_for_wheel/bld.bat | 2 +- conda-recipes/llvmdev_for_wheel/build.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda-recipes/llvmdev/bld.bat b/conda-recipes/llvmdev/bld.bat index 8b82c6480..6a6e39a78 100644 --- a/conda-recipes/llvmdev/bld.bat +++ b/conda-recipes/llvmdev/bld.bat @@ -27,7 +27,7 @@ cmake -G "Ninja" ^ -DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% ^ -DLLVM_USE_INTEL_JITEVENTS=ON ^ -DLLVM_ENABLE_LIBXML2=FORCE_ON ^ - -DLLVM_ENABLE_RTTI=ON ^ + -DLLVM_ENABLE_RTTI=OFF ^ -DLLVM_ENABLE_ZLIB=FORCE_ON ^ -DLLVM_ENABLE_ZSTD=FORCE_ON ^ -DLLVM_INCLUDE_BENCHMARKS=OFF ^ diff --git a/conda-recipes/llvmdev/build.sh b/conda-recipes/llvmdev/build.sh index c9e06ad03..e48b2ba6b 100644 --- a/conda-recipes/llvmdev/build.sh +++ b/conda-recipes/llvmdev/build.sh @@ -41,7 +41,7 @@ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DCMAKE_LIBRARY_PATH="${PREFIX}" \ -DLLVM_ENABLE_LIBEDIT=OFF \ -DLLVM_ENABLE_LIBXML2=OFF \ - -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_ENABLE_RTTI=OFF \ -DLLVM_ENABLE_TERMINFO=OFF \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ diff --git a/conda-recipes/llvmdev_for_wheel/bld.bat b/conda-recipes/llvmdev_for_wheel/bld.bat index 748188519..a7cadc08e 100644 --- a/conda-recipes/llvmdev_for_wheel/bld.bat +++ b/conda-recipes/llvmdev_for_wheel/bld.bat @@ -27,7 +27,7 @@ cmake -G "Ninja" ^ -DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% ^ -DLLVM_USE_INTEL_JITEVENTS=ON ^ -DLLVM_ENABLE_LIBXML2=OFF ^ - -DLLVM_ENABLE_RTTI=ON ^ + -DLLVM_ENABLE_RTTI=OFF ^ -DLLVM_ENABLE_ZLIB=OFF ^ -DLLVM_ENABLE_ZSTD=OFF ^ -DLLVM_INCLUDE_BENCHMARKS=OFF ^ diff --git a/conda-recipes/llvmdev_for_wheel/build.sh b/conda-recipes/llvmdev_for_wheel/build.sh index f39a8991b..8441903c2 100644 --- a/conda-recipes/llvmdev_for_wheel/build.sh +++ b/conda-recipes/llvmdev_for_wheel/build.sh @@ -45,7 +45,7 @@ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DLLVM_ENABLE_ZSTD=OFF \ -DLLVM_ENABLE_LIBEDIT=OFF \ -DLLVM_ENABLE_LIBXML2=OFF \ - -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_ENABLE_RTTI=OFF \ -DLLVM_ENABLE_TERMINFO=OFF \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ From 097782e1bca9cbdd86c9f8b7ad4caf288614847a Mon Sep 17 00:00:00 2001 From: swap357 Date: Mon, 18 Aug 2025 09:50:38 -0700 Subject: [PATCH 2/3] enable assertions for linux llvmdev builds --- conda-recipes/llvmdev/build.sh | 1 + conda-recipes/llvmdev_for_wheel/build.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/conda-recipes/llvmdev/build.sh b/conda-recipes/llvmdev/build.sh index e48b2ba6b..6d829fc89 100644 --- a/conda-recipes/llvmdev/build.sh +++ b/conda-recipes/llvmdev/build.sh @@ -42,6 +42,7 @@ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DLLVM_ENABLE_LIBEDIT=OFF \ -DLLVM_ENABLE_LIBXML2=OFF \ -DLLVM_ENABLE_RTTI=OFF \ + -DLLVM_ENABLE_ASSERTIONS=ON \ -DLLVM_ENABLE_TERMINFO=OFF \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ diff --git a/conda-recipes/llvmdev_for_wheel/build.sh b/conda-recipes/llvmdev_for_wheel/build.sh index 8441903c2..3c4752057 100644 --- a/conda-recipes/llvmdev_for_wheel/build.sh +++ b/conda-recipes/llvmdev_for_wheel/build.sh @@ -46,6 +46,7 @@ cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ -DLLVM_ENABLE_LIBEDIT=OFF \ -DLLVM_ENABLE_LIBXML2=OFF \ -DLLVM_ENABLE_RTTI=OFF \ + -DLLVM_ENABLE_ASSERTIONS=ON \ -DLLVM_ENABLE_TERMINFO=OFF \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ -DLLVM_INCLUDE_DOCS=OFF \ From d99f2e9595683fb69583958da03217b96ef4117b Mon Sep 17 00:00:00 2001 From: swap357 Date: Mon, 18 Aug 2025 13:01:31 -0700 Subject: [PATCH 3/3] update llvm version to 20.1.8 and sha on meta.yaml for llvmdev and llvmdev_for_wheel recipes --- conda-recipes/llvmdev/meta.yaml | 4 ++-- conda-recipes/llvmdev_for_wheel/meta.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda-recipes/llvmdev/meta.yaml b/conda-recipes/llvmdev/meta.yaml index e6a2ad75c..e6bccd88e 100644 --- a/conda-recipes/llvmdev/meta.yaml +++ b/conda-recipes/llvmdev/meta.yaml @@ -1,6 +1,6 @@ {% set shortversion = "20.1" %} -{% set version = "20.1.5" %} -{% set sha256_llvm = "a069565cd1c6aee48ee0f36de300635b5781f355d7b3c96a28062d50d575fa3e" %} +{% set version = "20.1.8" %} +{% set sha256_llvm = "6898f963c8e938981e6c4a302e83ec5beb4630147c7311183cf61069af16333d" %} {% set build_number = "0" %} package: diff --git a/conda-recipes/llvmdev_for_wheel/meta.yaml b/conda-recipes/llvmdev_for_wheel/meta.yaml index 69561b6f4..752574011 100644 --- a/conda-recipes/llvmdev_for_wheel/meta.yaml +++ b/conda-recipes/llvmdev_for_wheel/meta.yaml @@ -1,7 +1,7 @@ # This file is a copy of ../llvmdev/meta.yaml with minor changes for wheel # building -{% set shortversion = "15.0" %} -{% set version = "15.0.7" %} -{% set sha256_llvm = "8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6" %} +{% set shortversion = "20.1" %} +{% set version = "20.1.8" %} +{% set sha256_llvm = "6898f963c8e938981e6c4a302e83ec5beb4630147c7311183cf61069af16333d" %} {% set build_number = "1" %} package: