Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix LLVM detection #5231

Merged
merged 16 commits into from
Nov 11, 2024
Merged

Fix LLVM detection #5231

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eb1e7bc
Fix LLVM detection
syrusakbary Nov 7, 2024
a42fd4a
fix(ci): Add to
xdoardo Nov 7, 2024
f6fee0f
Fix(ci): Download zlib dependency on musl builds
xdoardo Nov 7, 2024
bba5795
fix(ci): Add zlib-static to dependencies for musl builds
xdoardo Nov 8, 2024
a98b7aa
fix(ci/musl): Don't install both llvm18-dev and llvm18-static
xdoardo Nov 8, 2024
48a7ad8
fix(ci): Revert previous removal of llvm18-dev
xdoardo Nov 11, 2024
db8fd39
fix(ci/musl): Use mold
xdoardo Nov 11, 2024
0887c93
fix(ci/musl): Install clang
xdoardo Nov 11, 2024
19a93cf
fix(ci/musl): Install mold
xdoardo Nov 11, 2024
8b816cb
fix(ci/musl): Intall zstd-static
xdoardo Nov 11, 2024
af22723
fix(ci/musl): Use same packages as in build.yml
xdoardo Nov 11, 2024
151336b
fix(ci/musl): Don't use mold
xdoardo Nov 11, 2024
e6844c8
fix(ci/musl): Disable LLVM on musl
xdoardo Nov 11, 2024
05db35f
fix(ci/musl): Fix typo
xdoardo Nov 11, 2024
f65e257
fix(ci/musl): Fix another typo
xdoardo Nov 11, 2024
e4c740d
fix(ci/musl): Uncomment setting for llvm-config
xdoardo Nov 11, 2024
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
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,19 @@ else ifeq ($(ENABLE_LLVM), 1)
LLVM_VERSION := $(shell llvm-config --version)
compilers += llvm
# … or try to autodetect LLVM from `llvm-config-<version>`.
else ifneq (, $(shell which llvm-config-15 2>/dev/null))
LLVM_VERSION := $(shell llvm-config-15 --version)
else ifneq (, $(shell which llvm-config-18 2>/dev/null))
LLVM_VERSION := $(shell llvm-config-18 --version)
compilers += llvm
# need force LLVM_SYS_150_PREFIX, or llvm_sys will not build in the case
export LLVM_SYS_150_PREFIX = $(shell llvm-config-15 --prefix)
# need force LLVM_SYS_180_PREFIX, or llvm_sys will not build in the case
export LLVM_SYS_180_PREFIX = $(shell llvm-config-18 --prefix)
else ifneq (, $(shell which llvm-config 2>/dev/null))
LLVM_VERSION := $(shell llvm-config --version)
ifneq (, $(findstring 15,$(LLVM_VERSION)))
ifneq (, $(findstring 18,$(LLVM_VERSION)))
compilers += llvm
export LLVM_SYS_150_PREFIX = $(shell llvm-config --prefix)
export LLVM_SYS_180_PREFIX = $(shell llvm-config --prefix)
else ifneq (, $(findstring 14,$(LLVM_VERSION)))
compilers += llvm
export LLVM_SYS_150_PREFIX = $(shell llvm-config --prefix)
export LLVM_SYS_180_PREFIX = $(shell llvm-config --prefix)
endif
endif

Expand Down
Loading