Skip to content

llvm21: drop libcxx and libunwind options (now part of llvm22) #61029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JkktBkkt wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −5
Open

llvm21: drop libcxx and libunwind options (now part of llvm22) #61029

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions srcpkgs/llvm21/template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
build_options="clang clang_tools_extra lld mlir libclc polly lldb flang bolt
openmp libc libcxx libunwind offload lto graphviz full_debug"
build_options_default="clang clang_tools_extra lld libclc polly lldb
libcxx libunwind mlir"
mlir"

# fails to build with libquadmth on musl
case "$XBPS_TARGET_MACHINE" in
Expand Down Expand Up @@ -163,13 +163,11 @@
$(vopt_if mlir 'mlir;')\
$(vopt_if flang 'flang;')"

_enabled_runtimes="compiler-rt\
_enabled_runtimes="compiler-rt;libunwind;libcxx;libcxxabi\
$(vopt_if openmp ';openmp')\
$(vopt_if offload ';offload')\
$(vopt_if libc ';libc')\
$(vopt_if libclc ';libclc')\
$(vopt_if libunwind ';libunwind')\
$(vopt_if libcxx ';libcxxabi;libcxx')"
$(vopt_if libclc ';libclc')"

configure_args+=" -DLLVM_ENABLE_RUNTIMES=${_enabled_runtimes}"
configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}"
Expand Down Expand Up @@ -338,7 +336,7 @@
cmake --fresh -G Ninja -S "${wrksrc}/libclc" -B "${wrksrc}/${build_wrksrc}/builddir_libclc_native" \
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=${wrksrc}/${build_wrksrc}/toolchain-native.cmake \
-DLLVM_CMAKE_DIR:PATH="/${_llvm_libdir}/cmake/llvm" \
-DLIBCLC_TARGETS_TO_BUILD=""

Check failure on line 339 in srcpkgs/llvm21/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 			-DLIBCLC_TARGETS_TO_BUILD=""
ninja "${makejobs}" -C "${wrksrc}/${build_wrksrc}/builddir_libclc_native" prepare_builtins
configure_args+=" "
fi
Expand Down Expand Up @@ -596,7 +594,7 @@
share/man/man1/clang-tblgen.1
)

alternatives=""

Check failure on line 597 in srcpkgs/llvm21/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 	alternatives=""
for _alt in "${_clang_files[@]}"; do
alternatives+=" clang:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
done
Expand Down Expand Up @@ -714,7 +712,7 @@
bin/scan-build-py
bin/scan-view
)
alternatives=""

Check failure on line 715 in srcpkgs/llvm21/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 	alternatives=""
for _alt in "${_clang_analyzer_files[@]}"; do
alternatives+=" clang-analyzer:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
done
Expand Down Expand Up @@ -749,7 +747,7 @@
share/man/man1/extraclangtools.1
)

alternatives=""

Check failure on line 750 in srcpkgs/llvm21/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 	alternatives=""
for _alt in "${_clang_tools_extra_files[@]}"; do
alternatives+=" clang-tools-extra:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
done
Expand All @@ -775,7 +773,7 @@
bin/merge-fdata
bin/llvm-bolt-heatmap
)
alternatives=""

Check failure on line 776 in srcpkgs/llvm21/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 	alternatives=""
for _alt in "${_llvm_bolt_files[@]}"; do
alternatives+=" llvm-bolt:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
done
Expand Down Expand Up @@ -808,7 +806,7 @@
if [ -z "$CROSS_BUILD" ]; then
_lldb_files+=("lib/lua/5.3/lldb.so")
fi
alternatives=""

Check failure on line 809 in srcpkgs/llvm21/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 	alternatives=""
for _alt in "${_lldb_files[@]}"; do
alternatives+=" lldb:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
done
Expand Down Expand Up @@ -851,7 +849,7 @@
bin/ld64.lld
bin/wasm-ld
)
alternatives=""

Check failure on line 852 in srcpkgs/llvm21/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 	alternatives=""
for _alt in "${_lld_files[@]}"; do
alternatives+=" lld:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
done
Expand Down Expand Up @@ -904,7 +902,7 @@
bin/tblgen-lsp-server
share/man/man1/mlir-tblgen.1
)
alternatives=""

Check failure on line 905 in srcpkgs/llvm21/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 	alternatives=""
for _alt in "${_mlir_files[@]}"; do
alternatives+=" mlir:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
done
Expand Down Expand Up @@ -947,7 +945,7 @@
bin/fir-opt
bin/tco
)
alternatives=""

Check failure on line 948 in srcpkgs/llvm21/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 	alternatives=""
for _alt in "${_flang_files[@]}"; do
alternatives+=" flang:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
done
Expand Down Expand Up @@ -999,7 +997,7 @@
_libomp_files+=("bin/llvm-omp-kernel-replay")
_libomp_files+=("lib/libomptarget.so")
fi
alternatives=""

Check failure on line 1000 in srcpkgs/llvm21/template

View workflow job for this annotation

GitHub Actions / Lint templates

Template Lint 

variable set to empty string: 	alternatives=""
for _alt in "${_libomp_files[@]}"; do
alternatives+=" libomp:/usr/${_alt}:/usr/${_llvm_prefix}/${_alt}"
done
Expand Down
Loading