mirror of
https://github.com/RPCS3/rpcs3
synced 2024-11-02 11:45:30 +00:00
Rebase LLVM fork
This commit is contained in:
parent
da6ce80f4f
commit
4a252e750f
2 changed files with 5 additions and 5 deletions
8
3rdparty/llvm.cmake
vendored
8
3rdparty/llvm.cmake
vendored
|
@ -26,7 +26,7 @@ if(NOT WITHOUT_LLVM)
|
|||
set(CMAKE_CXX_FLAGS ${CXX_FLAGS_OLD})
|
||||
|
||||
# now tries to find LLVM again
|
||||
find_package(LLVM 7.0 CONFIG)
|
||||
find_package(LLVM 8.0 CONFIG)
|
||||
if(NOT LLVM_FOUND)
|
||||
message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
|
||||
endif()
|
||||
|
@ -39,11 +39,11 @@ if(NOT WITHOUT_LLVM)
|
|||
set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
|
||||
endif()
|
||||
|
||||
find_package(LLVM 7.0 CONFIG)
|
||||
find_package(LLVM 8.0 CONFIG)
|
||||
|
||||
if (NOT LLVM_FOUND)
|
||||
if (LLVM_VERSION AND LLVM_VERSION_MAJOR LESS 7)
|
||||
message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 7.0. \
|
||||
if (LLVM_VERSION AND LLVM_VERSION_MAJOR LESS 8)
|
||||
message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 8.0. \
|
||||
Enable BUILD_LLVM_SUBMODULE option to build LLVM from included as a git submodule.")
|
||||
endif()
|
||||
|
||||
|
|
2
llvm
2
llvm
|
@ -1 +1 @@
|
|||
Subproject commit be9f7bfe2068d2e38b0136b854db021eb45e8b82
|
||||
Subproject commit 5c906fd1694e3c8f0b9548581d275ef01dc0972a
|
Loading…
Reference in a new issue