From 72102b78857cf8ad50dbdd40750ccb75617e4177 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 4 Jun 2024 19:28:48 -0400 Subject: [PATCH] libcxx: don't conflict with installed --- projects/libcxx.llvm.org/package.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/libcxx.llvm.org/package.yml b/projects/libcxx.llvm.org/package.yml index 2a2beb58..9b7188cf 100644 --- a/projects/libcxx.llvm.org/package.yml +++ b/projects/libcxx.llvm.org/package.yml @@ -6,11 +6,6 @@ versions: github: llvm/llvm-project strip: /^llvmorg-/ -runtime: - env: - linux: - CPATH: $CPATH:{{prefix}}/include/c++/v1 - build: dependencies: cmake.org: '>=3<3.29' @@ -46,6 +41,12 @@ test: dependencies: llvm.org: '*' script: + # installed libc++ causes header conflict + - run: | + if ! ldconfig -p | grep -q libc++.so; then + ARGS="$ARGS -cxx-isystem {{prefix}}/include/c++/v1" + fi + if: linux - run: clang++ $ARGS $FIXTURE fixture: extname: cpp