Skip to content

Commit

Permalink
Merge pull request #6 from savi-lang/update/llvm-15-0-6
Browse files Browse the repository at this point in the history
Update to LLVM 15.0.6 Release.
  • Loading branch information
jemc authored Jan 4, 2023
2 parents 52c2510 + 7684028 commit 7f3ab52
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,29 +61,29 @@ task:
# version of `make` that doesn't interpret our `Makefile` correctly.
MAKE: gmake
freebsd_instance:
image: freebsd-13-0-release-amd64
image: freebsd-13-1-release-amd64
<<: *hardware_spec

- name: x86_64-apple-macosx
- name: arm64-apple-macosx
environment:
TRIPLE: x86_64-apple-macosx
TRIPLE: arm64-apple-macosx
DEPS_INSTALL: " \
brew update --preinstall && brew install make cmake zlib && brew cleanup && \
mkdir /tmp/arm64 && \
brew fetch --bottle-tag=arm64_big_sur zlib && \
tar -xvf `brew --cache --bottle-tag=arm64_big_sur zlib` -C /tmp/arm64 --strip-components=2 && \
lipo -create /tmp/arm64/lib/libz.a /usr/local/opt/zlib/lib/libz.a -output /tmp/libz.a && \
mkdir /tmp/x86_64 && \
brew fetch --bottle-tag=ventura zlib && \
tar -xvf `brew --cache --bottle-tag=ventura zlib` -C /tmp/x86_64 --strip-components=2 && \
lipo -create /tmp/x86_64/lib/libz.a /opt/homebrew/opt/zlib/lib/libz.a -output /tmp/libz.a && \
echo Done!
"
MAKE_EXTRA_ARGS: " \
ZLIB_LIBRARY=/tmp/libz.a \
ZLIB_INCLUDE_DIR=/usr/local/opt/zlib/include \
ZLIB_INCLUDE_DIR=/opt/homebrew/opt/zlib/include \
"
# Set up the SDKROOT path specific to the present XCode version.
SDKROOT: /Applications/Xcode-12.5.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
SDKROOT: /Applications/Xcode-14.2.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "1" # optimizes brew install
macos_instance:
image: big-sur-xcode-12.5
image: ghcr.io/cirruslabs/macos-ventura-xcode:14.2
# 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
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
LLVM_VERSION=14.0.3
LLVM_VERSION=15.0.6
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=20220109
ZLIB_LIBRARY?=$(shell find /lib /opt /usr -name libz.a | head -n 1)
LLVM_CACHE_BUSTER_DATE=20230103
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 Expand Up @@ -47,6 +47,7 @@ $(LLVM_RELEASE_DIR)/build/CMakeCache.txt: $(LLVM_RELEASE_DIR)
-DLLVM_ENABLE_WARNINGS=OFF \
-DLLVM_ENABLE_Z3_SOLVER=OFF \
-DLLVM_ENABLE_ZLIB=FORCE_ON \
-DLLVM_ENABLE_ZSTD=OFF \
-DZLIB_LIBRARY="$(ZLIB_LIBRARY)" \
-DZLIB_INCLUDE_DIR=$(ZLIB_INCLUDE_DIR) \
-DLLVM_HAVE_LIBXAR=OFF \
Expand Down

0 comments on commit 7f3ab52

Please sign in to comment.