Update LLVM, ANTLR. Fix runtime build.

CMakeLists.txt

@@ -10,7 +10,7 @@ find_package(Java COMPONENTS Runtime REQUIRED) # Need java to run ANTLR, but onl
 include("${CMAKE_SOURCE_DIR}/cmake/get_llvm.cmake")
 
 # Set C++ standards.
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 
 # Add CXX flags.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")

cmake/get_antlr.cmake

@@ -20,12 +20,12 @@ file(TO_CMAKE_PATH "${_ANTLR_DIR}/bin" BIN_DIR) # Join dir.
 set(BIN_DIR ${BIN_DIR} CACHE PATH "ANTLR jar directory.") # Set for internal use.
 
 # Download ANTLR executable, saves us from ensuring people have java build tools (e.g. Maven)...
-file(TO_CMAKE_PATH "${BIN_DIR}/antlr-4.7.1-complete.jar" ANTLR_JAR)
+file(TO_CMAKE_PATH "${BIN_DIR}/antlr-4.8-complete.jar" ANTLR_JAR)
 if (NOT EXISTS "${ANTLR_JAR}")
   message(STATUS "Downloading ANTLR generator...")
   file(
     DOWNLOAD
-    http://www.antlr.org/download/antlr-4.7.1-complete.jar
+    http://www.antlr.org/download/antlr-4.8-complete.jar
     "${ANTLR_JAR}"
     SHOW_PROGRESS
   )

cmake/get_antlr_manual.cmake

@@ -18,7 +18,7 @@ if (NOT EXISTS "${ANTLR_JAR}")
   message(STATUS "Downloading ANTLR generator...")
   file(
     DOWNLOAD
-    http://www.antlr.org/download/antlr-4.7.1-complete.jar
+    http://www.antlr.org/download/antlr-4.8-complete.jar
     "${ANTLR_JAR}"
     SHOW_PROGRESS
   )
@@ -42,7 +42,7 @@ ExternalProject_Add(
 
   # ANTLR repository and tag.
   GIT_REPOSITORY https://github.com/antlr/antlr4.git
-  GIT_TAG "4.7.1"
+  GIT_TAG "4.8"
   UPDATE_COMMAND ""
   PATCH_COMMAND ""
   TIMEOUT 10

cmake/get_llvm.cmake

@@ -6,11 +6,11 @@ find_package(LLVM REQUIRED CONFIG)
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
-# Ensure we found our own specified version at 6.0.0. We don't want Ohaton's 3.x.x or another local
+# Ensure we found our own specified version at 10.0.0. We don't want Ohaton's 3.x.x or another local
 # build we don't know.
-if(NOT ("${LLVM_VERSION_MAJOR}" EQUAL 6 AND
+if(NOT ("${LLVM_VERSION_MAJOR}" EQUAL 10 AND
         "${LLVM_VERSION_MINOR}" EQUAL 0 AND
-        "${LLVM_VERSION_PATCH}" EQUAL 1))
+        "${LLVM_VERSION_PATCH}" EQUAL 0))
   message(FATAL_ERROR "LLVM version incompatible.")
 endif()
 

runtime/src/CMakeLists.txt

@@ -6,7 +6,7 @@ set(
 
 # Build our executable from the source files.
 add_library(gazrt SHARED ${gazprea_rt_files})
-target_include_directories(gazc PUBLIC ${RUNTIME_INCLUDE})
+target_include_directories(gazrt PUBLIC ${RUNTIME_INCLUDE})
 
 # Symbolic link our library to the base directory so we don't have to go searching for it.
 symlink_to_bin("gazrt")

scripts/configureLLVM.sh

@@ -32,7 +32,7 @@
 #   hanging, linking is probably the issue).
 # LLVM_ENABLE_DOXYGEN:
 #   Enables local docs building. Requires doxygen?
-LLVM_OPTIONS="-DLLVM_BUILD_TOOLS=OFF -DLLVM_BUILD_TESTS=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_OPTIMIZED_TABLEGEN=ON"
+LLVM_OPTIONS="-DLLVM_BUILD_TOOLS=ON -DLLVM_BUILD_TESTS=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_OPTIMIZED_TABLEGEN=ON"
 
 # -------------------------
 # STEP 1: CHOOSE PATHS.
@@ -102,4 +102,4 @@ if [[ "$unamestr" == 'Linux' ]]; then
    USE_GOLD="-DLLVM_USE_LINKER=gold"
 fi
 
-cmake "$SRC_DIR" -DCMAKE_BUILD_TYPE="$BUILD" -DLLVM_TARGETS_TO_BUILD=X86 $USE_GOLD $USE_INSTALL "$LLVM_OPTIONS"
+cmake "$SRC_DIR" -DCMAKE_BUILD_TYPE="$BUILD" -DLLVM_TARGETS_TO_BUILD=X86 $USE_GOLD $USE_INSTALL $LLVM_OPTIONS

src/CMakeLists.txt

@@ -11,8 +11,12 @@ target_include_directories(gazc PUBLIC ${ANTLR_GEN_DIR})
 # Ensure that the antlr4-runtime is available.
 add_dependencies(gazc antlr)
 
-# Add the antlr runtime and parser as libraries to link.
-target_link_libraries(gazc parser antlr4-runtime)
+# Find the libraries that correspond to the LLVM components
+# that we wish to use
+llvm_map_components_to_libnames(llvm_libs core)
+
+# Add the LLVM, antlr runtime and parser as libraries to link.
+target_link_libraries(gazc parser antlr4-runtime ${llvm_libs})
 
 # Symbolic link our executable to the base directory so we don't have to go searching for it.
 symlink_to_bin("gazc")