test(e2e): 86_llvm_hermetic_link + llvm suite unpinned from 20.1.7

86 asserts, via a -### dry-run with the exact ldflags mcpp generated, that
every CRT object and the effective dynamic linker resolve inside the sandbox
(an xpkgs path) — failing on both regression modes of issue #195: bare CRT
names (link failure on hosts without a system toolchain) and host-CRT
contamination (silent on hosts with one).

The llvm e2e scripts (36-41, 47, 65) source the new _llvm_env.sh instead of
hardcoding llvm@20.1.7: MCPP_E2E_LLVM_VERSION overrides, default is the
newest installed payload — so new toolchain versions get coverage the day
they're installed instead of never.

Author: Sunrisepeak

tests/e2e/36_llvm_toolchain.sh

@@ -3,17 +3,17 @@
 # 36_llvm_toolchain.sh — build a non-module C/C++ package with xlings LLVM.
 set -e
 
+source "$(dirname "$0")/_llvm_env.sh"
+
 OS="$(uname -s)"
 # On Windows the clang++ binary has a .exe suffix
 if [[ "$OS" == MINGW* || "$OS" == MSYS* || "$OS" == CYGWIN* ]]; then
-    LLVM_ROOT="${USERPROFILE}/.mcpp/registry/data/xpkgs/xim-x-llvm/20.1.7"
     CLANGPP_BIN="$LLVM_ROOT/bin/clang++.exe"
 else
-    LLVM_ROOT="${HOME}/.mcpp/registry/data/xpkgs/xim-x-llvm/20.1.7"
     CLANGPP_BIN="$LLVM_ROOT/bin/clang++"
 fi
 if [[ ! -x "$CLANGPP_BIN" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 is not installed"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} is not installed"
     exit 0
 fi
 
@@ -40,7 +40,7 @@ version = "0.1.0"
 import_std = false
 
 [toolchain]
-${TC_KEY} = "llvm@20.1.7"
+${TC_KEY} = "llvm@${LLVM_VERSION}"
 EOF
 
 cat > src/main.cpp <<'EOF'
@@ -61,9 +61,9 @@ int answer(void) {
 EOF
 
 "$MCPP" toolchain list > "$TMP/list.log" 2>&1
-grep -q 'llvm 20.1.7' "$TMP/list.log" || {
+grep -q "llvm ${LLVM_VERSION}" "$TMP/list.log" || {
     cat "$TMP/list.log"
-    echo "FAIL: toolchain list did not show installed llvm 20.1.7"
+    echo "FAIL: toolchain list did not show installed llvm ${LLVM_VERSION}"
     exit 1
 }
 

tests/e2e/37_llvm_import_std.sh

@@ -12,13 +12,14 @@ if [[ "$OS" == MINGW* || "$OS" == MSYS* || "$OS" == CYGWIN* ]]; then
     exit 0
 fi
 
-LLVM_ROOT="${HOME}/.mcpp/registry/data/xpkgs/xim-x-llvm/20.1.7"
+source "$(dirname "$0")/_llvm_env.sh"
+
 if [[ ! -x "$LLVM_ROOT/bin/clang++" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 is not installed"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} is not installed"
     exit 0
 fi
 if [[ ! -f "$LLVM_ROOT/share/libc++/v1/std.cppm" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 has no libc++ std.cppm"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} has no libc++ std.cppm"
     exit 0
 fi
 
@@ -30,13 +31,13 @@ source "$(dirname "$0")/_inherit_toolchain.sh"
 mkdir -p "$TMP/proj/src"
 cd "$TMP/proj"
 
-cat > mcpp.toml <<'EOF'
+cat > mcpp.toml <<EOF
 [package]
 name    = "hello_llvm_std"
 version = "0.1.0"
 
 [toolchain]
-linux = "llvm@20.1.7"
+linux = "llvm@${LLVM_VERSION}"
 EOF
 
 cat > src/main.cpp <<'EOF'

tests/e2e/38_llvm_modules.sh

@@ -16,13 +16,14 @@ if [[ "$OS" == MINGW* || "$OS" == MSYS* || "$OS" == CYGWIN* ]]; then
     exit 0
 fi
 
-LLVM_ROOT="${HOME}/.mcpp/registry/data/xpkgs/xim-x-llvm/20.1.7"
+source "$(dirname "$0")/_llvm_env.sh"
+
 if [[ ! -x "$LLVM_ROOT/bin/clang++" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 is not installed"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} is not installed"
     exit 0
 fi
 if [[ ! -f "$LLVM_ROOT/share/libc++/v1/std.cppm" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 has no libc++ std.cppm"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} has no libc++ std.cppm"
     exit 0
 fi
 
@@ -34,13 +35,13 @@ source "$(dirname "$0")/_inherit_toolchain.sh"
 mkdir -p "$TMP/proj/src"
 cd "$TMP/proj"
 
-cat > mcpp.toml <<'EOF'
+cat > mcpp.toml <<EOF
 [package]
 name    = "llvm_modules"
 version = "0.1.0"
 
 [toolchain]
-linux = "llvm@20.1.7"
+linux = "llvm@${LLVM_VERSION}"
 EOF
 
 # Module interface unit: exports greet()

tests/e2e/39_llvm_incremental.sh

@@ -3,13 +3,14 @@
 # 39_llvm_incremental.sh — Clang per-file incremental rebuild via clang-scan-deps dyndep.
 set -e
 
-LLVM_ROOT="${HOME}/.mcpp/registry/data/xpkgs/xim-x-llvm/20.1.7"
+source "$(dirname "$0")/_llvm_env.sh"
+
 if [[ ! -x "$LLVM_ROOT/bin/clang++" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 is not installed"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} is not installed"
     exit 0
 fi
 if [[ ! -f "$LLVM_ROOT/share/libc++/v1/std.cppm" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 has no libc++ std.cppm"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} has no libc++ std.cppm"
     exit 0
 fi
 
@@ -21,12 +22,12 @@ source "$(dirname "$0")/_inherit_toolchain.sh"
 mkdir -p "$TMP/proj/src"
 cd "$TMP/proj"
 
-cat > mcpp.toml <<'EOF'
+cat > mcpp.toml <<EOF
 [package]
 name    = "llvm_inc"
 version = "0.1.0"
 [toolchain]
-linux = "llvm@20.1.7"
+linux = "llvm@${LLVM_VERSION}"
 EOF
 
 cat > src/greet.cppm <<'EOF'

tests/e2e/40_llvm_bmi_cache.sh

@@ -12,13 +12,14 @@ if [[ "$OS" == MINGW* || "$OS" == MSYS* || "$OS" == CYGWIN* ]]; then
     exit 0
 fi
 
-LLVM_ROOT="${HOME}/.mcpp/registry/data/xpkgs/xim-x-llvm/20.1.7"
+source "$(dirname "$0")/_llvm_env.sh"
+
 if [[ ! -x "$LLVM_ROOT/bin/clang++" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 is not installed"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} is not installed"
     exit 0
 fi
 if [[ ! -f "$LLVM_ROOT/share/libc++/v1/std.cppm" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 has no libc++ std.cppm"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} has no libc++ std.cppm"
     exit 0
 fi
 
@@ -40,12 +41,12 @@ fi
 mkdir -p "$TMP/proj/src"
 cd "$TMP/proj"
 
-cat > mcpp.toml <<'EOF'
+cat > mcpp.toml <<EOF
 [package]
 name    = "llvm_cache"
 version = "0.1.0"
 [toolchain]
-linux = "llvm@20.1.7"
+linux = "llvm@${LLVM_VERSION}"
 [dependencies]
 "mcpplibs.cmdline" = "0.0.1"
 EOF

tests/e2e/41_llvm_std_compat.sh

@@ -12,13 +12,14 @@ if [[ "$OS" == MINGW* || "$OS" == MSYS* || "$OS" == CYGWIN* ]]; then
     exit 0
 fi
 
-LLVM_ROOT="${HOME}/.mcpp/registry/data/xpkgs/xim-x-llvm/20.1.7"
+source "$(dirname "$0")/_llvm_env.sh"
+
 if [[ ! -x "$LLVM_ROOT/bin/clang++" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 is not installed"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} is not installed"
     exit 0
 fi
 if [[ ! -f "$LLVM_ROOT/share/libc++/v1/std.compat.cppm" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 has no libc++ std.compat.cppm"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} has no libc++ std.compat.cppm"
     exit 0
 fi
 
@@ -30,12 +31,12 @@ source "$(dirname "$0")/_inherit_toolchain.sh"
 mkdir -p "$TMP/proj/src"
 cd "$TMP/proj"
 
-cat > mcpp.toml <<'EOF'
+cat > mcpp.toml <<EOF
 [package]
 name    = "compat_test"
 version = "0.1.0"
 [toolchain]
-linux = "llvm@20.1.7"
+linux = "llvm@${LLVM_VERSION}"
 EOF
 
 cat > src/main.cpp <<'EOF'

tests/e2e/47_llvm_atomic_link.sh

@@ -17,17 +17,18 @@ if [[ "$OS" == Darwin* ]]; then
     exit 0
 fi
 
-LLVM_ROOT="${HOME}/.mcpp/registry/data/xpkgs/xim-x-llvm/20.1.7"
+source "$(dirname "$0")/_llvm_env.sh"
+
 if [[ ! -x "$LLVM_ROOT/bin/clang++" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 is not installed"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} is not installed"
     exit 0
 fi
 # The fix only emits -latomic when a link-resolvable libatomic is present in
-# the toolchain (self-guarding). 20.1.7 bundles it; if a slimmed package does
-# not, the genuine-atomic case is out of scope here.
+# the toolchain (self-guarding). If a slimmed package does not bundle it, the
+# genuine-atomic case is out of scope here.
 if [[ ! -e "$LLVM_ROOT/lib/x86_64-unknown-linux-gnu/libatomic.so" \
    && ! -e "$LLVM_ROOT/lib/x86_64-unknown-linux-gnu/libatomic.a" ]]; then
-    echo "SKIP: llvm@20.1.7 package ships no link-resolvable libatomic"
+    echo "SKIP: llvm@${LLVM_VERSION} package ships no link-resolvable libatomic"
     exit 0
 fi
 
@@ -39,13 +40,13 @@ source "$(dirname "$0")/_inherit_toolchain.sh"
 mkdir -p "$TMP/proj/src"
 cd "$TMP/proj"
 
-cat > mcpp.toml <<'EOF'
+cat > mcpp.toml <<EOF
 [package]
 name    = "atomic_link"
 version = "0.1.0"
 
 [toolchain]
-linux = "llvm@20.1.7"
+linux = "llvm@${LLVM_VERSION}"
 EOF
 
 # 16-byte atomic → __atomic_load_16 / __atomic_compare_exchange_16 libcalls.

tests/e2e/65_toolchain_runtime_dirs_for_run.sh

@@ -11,9 +11,10 @@ if [[ "$OS" != "Linux" ]]; then
     exit 0
 fi
 
-LLVM_ROOT="${HOME}/.mcpp/registry/data/xpkgs/xim-x-llvm/20.1.7"
+source "$(dirname "$0")/_llvm_env.sh"
+
 if [[ ! -x "$LLVM_ROOT/bin/clang++" ]]; then
-    echo "SKIP: xlings llvm@20.1.7 is not installed"
+    echo "SKIP: xlings llvm@${LLVM_VERSION} is not installed"
     exit 0
 fi
 
@@ -25,13 +26,13 @@ source "$(dirname "$0")/_inherit_toolchain.sh"
 mkdir -p "$TMP/proj/src"
 cd "$TMP/proj"
 
-cat > mcpp.toml <<'EOF'
+cat > mcpp.toml <<EOF
 [package]
 name    = "toolchain_runtime_env"
 version = "0.1.0"
 
 [toolchain]
-linux = "llvm@20.1.7"
+linux = "llvm@${LLVM_VERSION}"
 
 [targets.toolchain_runtime_env]
 kind = "bin"
@@ -47,11 +48,13 @@ int main() {
     if (value == nullptr) return 10;
 
     std::string path(value);
-    if (path.find("xim-x-llvm/20.1.7/lib") == std::string::npos) return 11;
+    if (path.find("@LLVM_LIB_SUBSTR@") == std::string::npos) return 11;
     if (path.find("xim-x-glibc/2.39/lib64") == std::string::npos) return 12;
     return 0;
 }
 EOF
+# Inject the resolved LLVM version into the quoted heredoc via a placeholder.
+sed -i "s|@LLVM_LIB_SUBSTR@|xim-x-llvm/${LLVM_VERSION}/lib|" src/main.cpp
 
 "$MCPP" build > "$TMP/build.log" 2>&1 || {
     cat "$TMP/build.log"