Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion doc/rst/usingchapel/prereqs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ We have used the following commands to install the above prerequisites:
sudo pacman -Syu
sudo pacman -S base-devel
sudo pacman -S cmake git python
sudo pacman -S llvm20 clang20
sudo pacman -S llvm clang


* CentOS Stream 9, 10::
Expand Down
23 changes: 23 additions & 0 deletions util/cron/test-linux64-llvm21.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env bash
#
# Test default configuration on examples only, on linux64, with llvm 21

UTIL_CRON_DIR=$(cd $(dirname ${BASH_SOURCE[0]}) ; pwd)
source $UTIL_CRON_DIR/common.bash

source /hpcdc/project/chapel/setup_llvm.bash 21

# Check LLVM version via llvm-config from CHPL_LLVM_CONFIG
llvm_version=$($CHPL_LLVM_CONFIG --version)
if [ "$llvm_version" != "21.1.1" ]; then
echo "Wrong LLVM version"
echo "Expected Version: 21.1.1 Actual Version: $llvm_version"
exit 2
fi

export CHPL_LAUNCHER=none

export CHPL_NIGHTLY_TEST_CONFIG_NAME="linux64-llvm21"
export CHPL_NIGHTLY_TEST_DIRS="llvm/"

$UTIL_CRON_DIR/nightly -cron -examples -blog ${nightly_args}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ From: archlinux:base-devel

%post
/provision-scripts/pacman-deps.sh
/provision-scripts/pacman-llvm20.sh
/provision-scripts/pacman-llvm.sh

%runscript
../../provision-scripts/run.sh "$@"
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ brew install gcc #hide
# install some dependencies in homebrew
brew install cmake python gmp llvm #unsudo

# install LLVM version 20 as we don't support 21 yet
brew install llvm@20 #unsudo
brew install llvm #unsudo

# we could use Homebrew's gcc if that becomes important in the future:
# # link the homebrew-installed gcc-* to gcc
Expand Down
5 changes: 1 addition & 4 deletions util/packaging/homebrew/chapel-main.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Chapel < Formula
depends_on "gmp"
depends_on "hwloc"
depends_on "jemalloc"
depends_on "llvm@20"
depends_on "llvm"
depends_on "pkgconf"
depends_on "[email protected]"

Expand Down Expand Up @@ -174,9 +174,6 @@ def caveats
end

test do
# Hide ld warning until formula uses LLVM 21+ or if we apply backports to `llvm@20`
ENV["MACOSX_DEPLOYMENT_TARGET"] = MacOS.version.to_s if OS.mac? && MacOS.version >= :tahoe

ENV["CHPL_HOME"] = libexec
ENV["CHPL_INCLUDE_PATH"] = HOMEBREW_PREFIX/"include"
ENV["CHPL_LIB_PATH"] = HOMEBREW_PREFIX/"lib"
Expand Down