Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase LLVM fork

Browse Source
This commit is contained in:
Nekotekina
2018-10-01 20:31:55 +03:00
parent da6ce80f4f
commit 4a252e750f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
3rdparty/llvm.cmake
Vendored
+4 -4
View File
@@ -26,7 +26,7 @@ if(NOT WITHOUT_LLVM)
set(CMAKE_CXX_FLAGS ${CXX_FLAGS_OLD}) set(CMAKE_CXX_FLAGS ${CXX_FLAGS_OLD})
# now tries to find LLVM again # now tries to find LLVM again
find_package(LLVM 7.0 CONFIG) find_package(LLVM 8.0 CONFIG)
if(NOT LLVM_FOUND) if(NOT LLVM_FOUND)
message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`") message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
endif() endif()
@@ -39,11 +39,11 @@ if(NOT WITHOUT_LLVM)
set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR}) set(LLVM_DIR ${CMAKE_SOURCE_DIR}/${LLVM_DIR})
endif() endif()
find_package(LLVM 7.0 CONFIG) find_package(LLVM 8.0 CONFIG)
if (NOT LLVM_FOUND) if (NOT LLVM_FOUND)
if (LLVM_VERSION AND LLVM_VERSION_MAJOR LESS 7) if (LLVM_VERSION AND LLVM_VERSION_MAJOR LESS 8)
message(FATAL_ERROR "Found LLVM version ${LLVM_VERSION}. Required version 7.0. \ 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.") Enable BUILD_LLVM_SUBMODULE option to build LLVM from included as a git submodule.")
endif() endif()
llvm
+1 -1
Submodule llvm updated: be9f7bfe20...5c906fd169