Force builds against libLLVM.dylib and drop LLVM 7

.github/workflows/ci-ubuntu-18.yml

@@ -19,7 +19,7 @@ jobs:
     container: ubuntu:18.04
     strategy:
       matrix:
-        LLVM_VERSION: ["7.0", "8.0", "9.0", "10.0"]
+        LLVM_VERSION: ["8.0", "9.0", "10.0"]
 
     steps:
       - name: For debugging

.github/workflows/ci-ubuntu-20.yml → .github/workflows/ci-ubuntu-20.04.yml

@@ -19,7 +19,7 @@ jobs:
     container: ubuntu:20.04
     strategy:
       matrix:
-        LLVM_VERSION: ["7.0", "8.0", "9.0", "10.0", "11.0", "12.0", "13.0"]
+        LLVM_VERSION: ["8.0", "9.0", "10.0", "11.0", "12.0"]
 
     steps:
       - name: Install software

CMakeLists.txt

@@ -202,17 +202,6 @@ set (MULL_INCLUDE_DIRS
   ${CMAKE_CURRENT_LIST_DIR}/LLVMCompatibility/${LLVM_COMPATIBILITY_DIR}
 )
 
-if ("LLVM" IN_LIST LLVM_AVAILABLE_LIBS)
-  set (MULL_LLVM_COMPATIBILITY_LIBRARIES
-    LLVM
-  )
-else()
-  set (MULL_LLVM_COMPATIBILITY_LIBRARIES
-    LLVMSupport
-    LLVMCore
-  )
-endif()
-
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/cpack.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/version.cmake)
 

LLVMCompatibility/10.x.x/CMakeLists.txt

@@ -10,4 +10,3 @@ set_target_properties(LLVMCompatibility PROPERTIES
 target_include_directories(LLVMCompatibility SYSTEM PUBLIC
   ${LLVM_INCLUDE_DIRS}
 )
-add_dependencies(LLVMCompatibility ${MULL_LLVM_COMPATIBILITY_LIBRARIES})

LLVMCompatibility/11.x.x/CMakeLists.txt

@@ -10,4 +10,3 @@ set_target_properties(LLVMCompatibility PROPERTIES
 target_include_directories(LLVMCompatibility SYSTEM PUBLIC
   ${LLVM_INCLUDE_DIRS}
 )
-add_dependencies(LLVMCompatibility ${MULL_LLVM_COMPATIBILITY_LIBRARIES})

LLVMCompatibility/12.x.x/CMakeLists.txt

@@ -10,4 +10,3 @@ set_target_properties(LLVMCompatibility PROPERTIES
 target_include_directories(LLVMCompatibility SYSTEM PUBLIC
   ${LLVM_INCLUDE_DIRS}
 )
-add_dependencies(LLVMCompatibility ${MULL_LLVM_COMPATIBILITY_LIBRARIES})

LLVMCompatibility/13.x.x/CMakeLists.txt

@@ -10,4 +10,3 @@ set_target_properties(LLVMCompatibility PROPERTIES
 target_include_directories(LLVMCompatibility SYSTEM PUBLIC
   ${LLVM_INCLUDE_DIRS}
 )
-add_dependencies(LLVMCompatibility ${MULL_LLVM_COMPATIBILITY_LIBRARIES})

LLVMCompatibility/8.x.x/CMakeLists.txt

@@ -10,4 +10,3 @@ set_target_properties(LLVMCompatibility PROPERTIES
 target_include_directories(LLVMCompatibility SYSTEM PUBLIC
   ${LLVM_INCLUDE_DIRS}
 )
-add_dependencies(LLVMCompatibility ${MULL_LLVM_COMPATIBILITY_LIBRARIES})

LLVMCompatibility/9.x.x/CMakeLists.txt

@@ -10,4 +10,3 @@ set_target_properties(LLVMCompatibility PROPERTIES
 target_include_directories(LLVMCompatibility SYSTEM PUBLIC
   ${LLVM_INCLUDE_DIRS}
 )
-add_dependencies(LLVMCompatibility ${MULL_LLVM_COMPATIBILITY_LIBRARIES})

cmake/packaging/cpack.DEB-ubuntu.cmake

@@ -3,12 +3,10 @@ set (CPACK_GENERATOR DEB)
 set (CPACK_DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT})
 set (CPACK_DEBIAN_PACKAGE_DESCRIPTION ${PROJECT_DESCRIPTION})
 
-
 if (NOT NO_PRECOMPILED_LLVM)
   set (deps "zlib1g, libncurses5, libstdc++6, libxml2, libsqlite3-0")
 else()
   set (deps "libllvm${LLVM_VERSION_MAJOR}, libxml2, libsqlite3-0")
 endif()
 
 set (CPACK_DEBIAN_PACKAGE_DEPENDS ${deps})
-

infrastructure/helpers/variables.yaml

@@ -31,11 +31,6 @@ llvm_mapping:
       precompiled: true
       path: /usr/local/opt/llvm@8
       brew_llvm_package: llvm@8
-    7.0.0:
-      url: https://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz
-      precompiled: true
-      path: /usr/local/opt/llvm@7
-      brew_llvm_package: llvm@7
 
   debian:
     6.0.0:
@@ -46,7 +41,15 @@ llvm_mapping:
     13.0.0:
       url: https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz
       path: clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-20.04
-      precompiled: true
+      precompiled: false
+      packages:
+        - llvm-13-dev
+        - libclang-13-dev
+        - libc++-13-dev
+        - libc++abi-13-dev
+        - clang-13
+      cmake_cc: clang-13
+      cmake_cxx: clang++-13
     12.0.0:
       url: https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz
       path: clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04
@@ -107,17 +110,6 @@ llvm_mapping:
         - clang-8
       cmake_cc: clang-8
       cmake_cxx: clang++-8
-    7.0.0:
-      url: https://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz
-      path: clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04
-      precompiled: true
-      packages:
-        - llvm-7-dev
-        - libclang-7-dev
-        - libc++-7-dev
-        - clang-7
-      cmake_cc: clang-7
-      cmake_cxx: clang++-7
 
   fedora:
     6.0.0:

lib/CMakeLists.txt

@@ -120,29 +120,11 @@ add_library(mull
 
 set_source_files_properties(${mull_header_dirs} PROPERTIES HEADER_FILE_ONLY ON)
 
-if ("LLVM" IN_LIST LLVM_AVAILABLE_LIBS)
-  set(MULL_LLVM_LIBRARIES
-    LLVM
-    )
-else ()
-  set(MULL_LLVM_LIBRARIES
-    LLVMSupport
-    LLVMOption
-    LLVMCoverage
-    LLVMProfileData
-    LLVMAsmParser
-    LLVMSupport
-    LLVMOption
-    LLVM${LLVM_NATIVE_ARCH}CodeGen
-    LLVM${LLVM_NATIVE_ARCH}AsmParser
-    )
-endif ()
-
 find_package(Threads REQUIRED)
 find_package(SQLite3 REQUIRED)
 
 target_link_libraries(mull
-  ${MULL_LLVM_LIBRARIES}
+  LLVM
   SQLite::SQLite3
   clangTooling
   Threads::Threads

tools/mull-cxx/CMakeLists.txt

@@ -3,19 +3,9 @@ set (SOURCES
   ${CMAKE_CURRENT_LIST_DIR}/../CLIOptions/CLIOptions.cpp
 )
 
-if ("LLVM" IN_LIST LLVM_AVAILABLE_LIBS)
-  set (MULL_CXX_LLVM_LIBRARIES
-    LLVM
-  )
-else()
-  set (MULL_CXX_LLVM_LIBRARIES
-    LLVMObject
-  )
-endif()
-
 add_mull_executable(
   NAME mull-cxx-${LLVM_VERSION_MAJOR}
   SOURCES ${SOURCES}
-  LINK_WITH ebc mull ${MULL_CXX_LLVM_LIBRARIES} json11
+  LINK_WITH ebc mull json11 LLVM
 )
 target_include_directories(mull-cxx-${LLVM_VERSION_MAJOR} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../CLIOptions)

tools/mull-runner/CMakeLists.txt

@@ -8,6 +8,6 @@ set (SOURCES
 add_mull_executable(
   NAME mull-runner-${LLVM_VERSION_MAJOR}
   SOURCES ${SOURCES}
-  LINK_WITH mull json11
+  LINK_WITH mull json11 LLVM
 )
 target_include_directories(mull-runner-${LLVM_VERSION_MAJOR} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../CLIOptions)