diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index e445e4c85d..d5757c64bb 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -59,7 +59,7 @@ install(TARGETS blake2 find_package(Git) set(LLVM_DESIRED_HASH "1f9140064dfbfb0bbda8e51306ea51080b2f7aac") -set(PATCHES_DESIRED_HASH "a16f299fbfced16a2bbc628746db341f2a5af9ae8cc9c9ef4b1e9ca26de3c292") +set(PATCHES_DESIRED_HASH "3e16c097794cb669a8f6a0bd7600b440205ac5c29a6135750c2e83263eb16a95") if(GIT_FOUND) if(EXISTS "${PROJECT_SOURCE_DIR}/../.git") diff --git a/lib/llvm/patches/2020-07-28-01-c-exports.diff b/lib/llvm/patches/2020-07-28-01-c-exports.diff deleted file mode 100644 index ff0e5860cd..0000000000 --- a/lib/llvm/patches/2020-07-28-01-c-exports.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/llvm/tools/llvm-shlib/CMakeLists.txt b/llvm/tools/llvm-shlib/CMakeLists.txt -index f3a2056f80d..3339dc58218 100644 ---- a/llvm/tools/llvm-shlib/CMakeLists.txt -+++ b/llvm/tools/llvm-shlib/CMakeLists.txt -@@ -79,9 +79,9 @@ if(LLVM_BUILD_LLVM_C_DYLIB AND NOT MSVC) - # To get the export list for a single llvm library: - # nm ${LIB_PATH} | awk "/T _LLVM/ { print $3 }" | sort -u | sed -e "s/^_//g" > ${LIB_PATH}.exports - -- set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_BINARY_DIR}/libllvm-c.exports) -+ set(LLVM_EXPORTED_SYMBOL_FILE ${LLVM_BINARY_DIR}/libllvm-c.exports) - -- set(LIB_DIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+ set(LIB_DIR ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) - set(LIB_NAME ${LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}LLVM) - set(LIB_PATH ${LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(LIB_EXPORTS_PATH ${LIB_NAME}.exports) -@@ -125,11 +125,11 @@ if(LLVM_BUILD_LLVM_C_DYLIB AND MSVC) - - # Set this name here, not used in multi conf loop, - # but add script will pick the right one. -- set(LIBSFILE ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllvm-c.args) -+ set(LIBSFILE ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllvm-c.args) - - # Get the full name to the libs so the python script understands them. - foreach(lib ${LIB_NAMES}) -- list(APPEND FULL_LIB_NAMES ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/${lib}.lib) -+ list(APPEND FULL_LIB_NAMES ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/${lib}.lib) - endforeach() - - # Need to separate lib names with newlines. -@@ -143,7 +143,7 @@ if(LLVM_BUILD_LLVM_C_DYLIB AND MSVC) - # Write out the full lib names into file to be read by the python script. - # One libsfile per build, the add_custom_command should expand - # ${CMAKE_CFG_INTDIR} correctly and select the right one. -- file(WRITE ${CMAKE_BINARY_DIR}/${BUILD_MODE}/libllvm-c.args "${PER_CONF_CONTENT}") -+ file(WRITE ${LLVM_BINARY_DIR}/${BUILD_MODE}/libllvm-c.args "${PER_CONF_CONTENT}") - endforeach() - else() - # Write out the full lib names into file to be read by the python script. -@@ -153,7 +153,7 @@ if(LLVM_BUILD_LLVM_C_DYLIB AND MSVC) - # Generate the exports file dynamically. - set(GEN_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/gen-msvc-exports.py) - -- set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllvm-c.exports) -+ set(LLVM_EXPORTED_SYMBOL_FILE ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllvm-c.exports) - if(NOT LLVM_NM) - if(CMAKE_CROSSCOMPILING) - build_native_tool(llvm-nm llvm_nm)