sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (b56a6ccd64c8cae39b19647605e1358da6ca7d13)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (b56a6ccd64c8cae39b19647605e1358da6ca7d13)
- Date: Mon, 9 Nov 2026 21:58:58 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
devel/llvm/HISTORY | 4 ++++
devel/llvm/PREPARE | 12 +++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit b56a6ccd64c8cae39b19647605e1358da6ca7d13
Author: chris_debian <cjhandrew AT gmail.com>
Commit: Pavel Vinogradov <public AT sourcemage.org>
devel/llvm: enable clang when any runtime is built
The runtimes are configured with the just-built clang, so on a clean
system
the default answers (all runtimes, no clang) fail with "could not find
TARGET clang-resource-headers". Turn clang on whenever runtimes are chosen
(directly, or through flang or lld). Also expand "all" only when it was
chosen: the check looked at the list of choices, which always contains
"all".
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index c4a4938..8763d43 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,7 @@
+2026-11-08 Chris Andrew <cjhandrew AT gmail.com>
+ * PREPARE: only expand "all" runtimes when "all" was chosen;
+ enable clang when any runtime is built (they need it to configure)
+
2026-11-03 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: slot 0: version 23.1.5, SPIRV_VERSION=23.1.3
diff --git a/devel/llvm/PREPARE b/devel/llvm/PREPARE
index 0ff5c6a..d93a56d 100755
--- a/devel/llvm/PREPARE
+++ b/devel/llvm/PREPARE
@@ -90,7 +90,7 @@ config_query_multi LLVM_RUNTIMES \
# selecting "all" runtimes in the LLVM build system will only enable libcxx,
# libcxxabi, and libunwind, instead of actually all possible supported
# runtimes, so specify them manually
-if list_find "$runtimes" "all" ;then
+if list_find "$LLVM_RUNTIMES" "all" ;then
LLVM_RUNTIMES="${runtimes#all }"
fi &&
@@ -130,6 +130,16 @@ config_query LLVM_WITH_LLD "Build the LLVM linker
(lld)?" n &&
config_query LLVM_WITH_MLIR "Build the LLVM multi-level intermediate
representation (MLIR)?" n &&
config_query LLVM_WITH_FLANG "Build the flang fortran frontend (selects
MLIR)?" n &&
+# the runtimes are configured with the just-built clang, so building any of
+# them (chosen above, or selected by flang or lld below) needs clang;
+# without it the build fails with "could not find TARGET
clang-resource-headers"
+if [[ "$LLVM_WITH_CLANG" != y ]] &&
+ [[ -n "${LLVM_RUNTIMES// }" || "$LLVM_WITH_FLANG" == y ||
"$LLVM_WITH_LLD" == y ]] ;then
+ message "${MESSAGE_COLOR}The runtime libraries need clang, enabling
clang.${DEFAULT_COLOR}" &&
+ LLVM_WITH_CLANG=y &&
+ persistent_add LLVM_WITH_CLANG
+fi &&
+
if [[ "$LLVM_WITH_CLANG" == y ]] ;then
config_query LLVM_WITH_LIBCLC "Build the LLVM OpenCL implementation
(libclc)?" n &&
if [[ "$LLVM_WITH_LIBCLC" == y ]] ;then
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (b56a6ccd64c8cae39b19647605e1358da6ca7d13), Pavel Vinogradov, 11/09/2026
Archive powered by MHonArc 2.6.24.