Skip to content

Commit f20cfee

Browse files
committed
llvm@13 fixes local M1 build, try on buildserver
haskell-crypto/cryptonite#372 (comment)
1 parent 9612b17 commit f20cfee

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

.github/workflows/build-macos-arm64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
- name: Run distribution script
2323
run: |
2424
test -x "$(which ghcup)" && curl https://downloads.haskell.org/~ghcup/aarch64-apple-darwin-ghcup -o ~/.local/bin/ghcup && chmod a+x ~/.local/bin/ghcup
25-
brew install llvm@12
25+
brew install llvm@13
2626
cd distribution
2727
./build-macos-arm64.sh

.github/workflows/build-macos-x86_64.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@ jobs:
2222
- name: Run distribution script
2323
run: |
2424
test -x "$(which ghcup)" && curl https://downloads.haskell.org/~ghcup/aarch64-apple-darwin-ghcup -o ~/.local/bin/ghcup && chmod a+x ~/.local/bin/ghcup
25-
brew install llvm@12
2625
cd distribution
2726
./build-macos-x86_64.sh

distribution/build-macos-arm64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ git submodule init && git submodule update
3636
ffiLibs="$(xcrun --show-sdk-path)/usr/include/ffi" # Workaround for GHC9.0.2 bug until we can use GHC9.2.3+
3737
export C_INCLUDE_PATH=$ffiLibs # https://gitlab.haskell.org/ghc/ghc/-/issues/20592#note_436353
3838

39-
export PATH="/opt/homebrew/opt/llvm@12/bin:$PATH" # The arm64 build currently requires llvm until we get to GHC 9.4+
39+
export PATH="/opt/homebrew/opt/llvm@13/bin:$PATH" # The arm64 build currently requires llvm until we get to GHC 9.4+
4040

4141
$stack install --local-bin-path $dist
4242

0 commit comments

Comments
 (0)