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.

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

Fixes to allow compiling with LLVM16 #6889

Merged
merged 1 commit into from
Jul 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2153,6 +2153,10 @@ ifneq (,$(findstring clang version 15.0,$(CLANG_VERSION)))
CLANG_OK=yes
endif

ifneq (,$(findstring clang version 16.0,$(CLANG_VERSION)))
CLANG_OK=yes
endif

ifneq (,$(findstring Apple LLVM version 5.0,$(CLANG_VERSION)))
CLANG_OK=yes
endif
Expand All @@ -2173,7 +2177,7 @@ $(BUILD_DIR)/clang_ok:
@exit 1
endif

ifneq (,$(findstring $(LLVM_VERSION_TIMES_10), 130 140, 150))
ifneq (,$(findstring $(LLVM_VERSION_TIMES_10), 130 140 150 160))
LLVM_OK=yes
endif

Expand Down
4 changes: 2 additions & 2 deletions dependencies/llvm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ if (LLVM_PACKAGE_VERSION VERSION_LESS 13.0)
message(FATAL_ERROR "LLVM version must be 13.0 or newer")
endif ()

if (LLVM_PACKAGE_VERSION VERSION_GREATER 15.0)
message(WARNING "Halide is not tested on LLVM versions beyond 15.0")
if (LLVM_PACKAGE_VERSION VERSION_GREATER 16.0)
message(WARNING "Halide is not tested on LLVM versions beyond 16.0")
endif ()

set(Halide_LLVM_DEFS ${LLVM_DEFINITIONS} $<BUILD_INTERFACE:LLVM_VERSION=${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}>)
Expand Down