Skip to content

Commit

Permalink
Merge pull request #9 from savi-lang/update/llvm-18-1-8
Browse files Browse the repository at this point in the history
Update to LLVM 18.1.8
  • Loading branch information
jemc authored Aug 5, 2024
2 parents 7f3ab52 + 3292ec4 commit 5435c7c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ task:
# We need extra CPU and memory to get through this harrowing LLVM build.
container: &hardware_spec
cpu: 8
memory: 8
memory: 10

environment:
GITHUB_API_TOKEN: ENCRYPTED[df28a2928d936fa65f97e38a3f2e9fe210f456a3a8ac926896b38eac4b66f8364822593cfd4e69865db5e9fb397472cf]
Expand All @@ -17,7 +17,7 @@ task:
matrix:
- name: x86_64-unknown-linux-gnu
container:
image: ubuntu:20.04
image: ubuntu:22.04
environment:
TRIPLE: x86_64-unknown-linux-gnu
DEPS_INSTALL: "\
Expand Down Expand Up @@ -61,13 +61,14 @@ task:
# version of `make` that doesn't interpret our `Makefile` correctly.
MAKE: gmake
freebsd_instance:
image: freebsd-13-1-release-amd64
image: freebsd-13-2-release-amd64
<<: *hardware_spec

- name: arm64-apple-macosx
environment:
TRIPLE: arm64-apple-macosx
DEPS_INSTALL: " \
ls /Applications && \
brew update --preinstall && brew install make cmake zlib && brew cleanup && \
mkdir /tmp/x86_64 && \
brew fetch --bottle-tag=ventura zlib && \
Expand All @@ -80,10 +81,10 @@ task:
ZLIB_INCLUDE_DIR=/opt/homebrew/opt/zlib/include \
"
# Set up the SDKROOT path specific to the present XCode version.
SDKROOT: /Applications/Xcode-14.2.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
SDKROOT: /Applications/Xcode_15.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "1" # optimizes brew install
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.2
image: ghcr.io/cirruslabs/macos-runner:sonoma
# Caching some homebrew directories helps save some of the otherwise huge
# amount of time that it takes to update brew from the CI base image.
brew_cache:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
LLVM_VERSION=15.0.6
LLVM_VERSION=18.1.8
LLVM_DOWNLOAD_URL?="https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION)/llvm-project-$(LLVM_VERSION).src.tar.xz"
LLVM_BUILD_ARGS?=""
LLVM_SOURCE_ARCHIVE=lib/llvm-$(LLVM_VERSION).src.tar.xz
LLVM_RELEASE_DIR=lib/llvm-$(LLVM_VERSION)
LLVM_INSTALL_DIR=lib/llvm
LLVM_CACHE_BUSTER_DATE=20230103
LLVM_CACHE_BUSTER_DATE=20240803
ZLIB_LIBRARY?=$(shell find /lib /opt /usr/lib /usr -name libz.a | head -n 1)
ZLIB_INCLUDE_DIR?=$(shell find /usr /opt -name zlib.h | head -n 1 | xargs dirname)
PWD?=$(shell pwd)
Expand Down

0 comments on commit 5435c7c

Please sign in to comment.