Skip to content

Commit 0d56dee

Browse files
aykevldeadprogram
authored andcommitted
ci: don't link with libzstd in release builds
libzstd was added in LLVM 15, but we don't currently use it. So let's disable it in LLVM just like libzlib. See: https://reviews.llvm.org/D128465
1 parent 1f0bf9b commit 0d56dee

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/build-macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/cache@v3
4848
id: cache-llvm-build
4949
with:
50-
key: llvm-build-15-macos-v2
50+
key: llvm-build-15-macos-v3
5151
path: llvm-build
5252
- name: Build LLVM
5353
if: steps.cache-llvm-build.outputs.cache-hit != 'true'

.github/workflows/linux.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
uses: actions/cache@v3
5858
id: cache-llvm-build
5959
with:
60-
key: llvm-build-15-linux-alpine-v2
60+
key: llvm-build-15-linux-alpine-v3
6161
path: llvm-build
6262
- name: Build LLVM
6363
if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -186,7 +186,7 @@ jobs:
186186
uses: actions/cache@v3
187187
id: cache-llvm-build
188188
with:
189-
key: llvm-build-15-linux-asserts-v2
189+
key: llvm-build-15-linux-asserts-v3
190190
path: llvm-build
191191
- name: Build LLVM
192192
if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -272,7 +272,7 @@ jobs:
272272
uses: actions/cache@v3
273273
id: cache-llvm-build
274274
with:
275-
key: llvm-build-15-linux-arm-v2
275+
key: llvm-build-15-linux-arm-v3
276276
path: llvm-build
277277
- name: Build LLVM
278278
if: steps.cache-llvm-build.outputs.cache-hit != 'true'
@@ -372,7 +372,7 @@ jobs:
372372
uses: actions/cache@v3
373373
id: cache-llvm-build
374374
with:
375-
key: llvm-build-15-linux-arm64-v2
375+
key: llvm-build-15-linux-arm64-v3
376376
path: llvm-build
377377
- name: Build LLVM
378378
if: steps.cache-llvm-build.outputs.cache-hit != 'true'

.github/workflows/windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
uses: actions/cache@v3
5050
id: cache-llvm-build
5151
with:
52-
key: llvm-build-15-windows-v2
52+
key: llvm-build-15-windows-v3
5353
path: llvm-build
5454
- name: Build LLVM
5555
if: steps.cache-llvm-build.outputs.cache-hit != 'true'

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ llvm-source: $(LLVM_PROJECTDIR)/llvm
242242
# Configure LLVM.
243243
TINYGO_SOURCE_DIR=$(shell pwd)
244244
$(LLVM_BUILDDIR)/build.ninja:
245-
mkdir -p $(LLVM_BUILDDIR) && cd $(LLVM_BUILDDIR) && cmake -G Ninja $(TINYGO_SOURCE_DIR)/$(LLVM_PROJECTDIR)/llvm "-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64;RISCV;WebAssembly" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR;Xtensa" -DCMAKE_BUILD_TYPE=Release -DLIBCLANG_BUILD_STATIC=ON -DLLVM_ENABLE_TERMINFO=OFF -DLLVM_ENABLE_ZLIB=OFF -DLLVM_ENABLE_LIBEDIT=OFF -DLLVM_ENABLE_Z3_SOLVER=OFF -DLLVM_ENABLE_OCAMLDOC=OFF -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_ENABLE_PROJECTS="clang;lld" -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF -DCLANG_ENABLE_STATIC_ANALYZER=OFF -DCLANG_ENABLE_ARCMT=OFF $(LLVM_OPTION)
245+
mkdir -p $(LLVM_BUILDDIR) && cd $(LLVM_BUILDDIR) && cmake -G Ninja $(TINYGO_SOURCE_DIR)/$(LLVM_PROJECTDIR)/llvm "-DLLVM_TARGETS_TO_BUILD=X86;ARM;AArch64;RISCV;WebAssembly" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR;Xtensa" -DCMAKE_BUILD_TYPE=Release -DLIBCLANG_BUILD_STATIC=ON -DLLVM_ENABLE_TERMINFO=OFF -DLLVM_ENABLE_ZLIB=OFF -DLLVM_ENABLE_ZSTD=OFF -DLLVM_ENABLE_LIBEDIT=OFF -DLLVM_ENABLE_Z3_SOLVER=OFF -DLLVM_ENABLE_OCAMLDOC=OFF -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_ENABLE_PROJECTS="clang;lld" -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF -DCLANG_ENABLE_STATIC_ANALYZER=OFF -DCLANG_ENABLE_ARCMT=OFF $(LLVM_OPTION)
246246

247247
# Build LLVM.
248248
$(LLVM_BUILDDIR): $(LLVM_BUILDDIR)/build.ninja

0 commit comments

Comments
 (0)