Merge branch 'embed-lld'

Zig now depends on LLVM 5.0.0.

For the latest version that supports LLVM 4.0.1, use
2a49c87.

Unfortunately we had to embed LLD into Zig due to some
MACH-O related LLD bugs. One of them is already upstream
and another is awaiting feedback on the llvm-dev mailing
list.

You can use cmake option -DZIG_FORCE_EXTERNAL_LLD=ON to
still use external LLD if you want to live with the MACH-O
bugs or if your system LLD is patched.

Closes #273

Author: andrewrk

.travis.yml

@@ -1,23 +1,16 @@
+os:
+  - linux
+  - osx
 dist: trusty
+osx_image: xcode8.3
 sudo: required
 language: cpp
 before_install:
-  - sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main" >> /etc/apt/sources.list'
-  - wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
-  - sudo apt-get update -q
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ci/travis_linux_before_install; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ci/travis_osx_before_install; fi
 install:
-  - sudo apt-get remove -y llvm-*
-  - sudo rm -rf /usr/local/*
-  - sudo apt-get install -y clang-4.0 libclang-4.0 libclang-4.0-dev llvm-4.0 llvm-4.0-dev liblld-4.0 liblld-4.0-dev cmake
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ci/travis_linux_install; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ci/travis_osx_install; fi
 script:
-  - export CC=clang-4.0
-  - export CXX=clang++-4.0
-  - which $CC
-  - which $CXX
-  - echo $PATH
-  - mkdir build
-  - cd build
-  - cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o))
-  - make VERBOSE=1
-  - make install
-  - ./zig build --build-file ../build.zig test
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ci/travis_linux_script; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ci/travis_osx_script; fi

CMakeLists.txt

@@ -22,6 +22,9 @@ set(ZIG_EACH_LIB_RPATH off CACHE BOOL "Add each dynamic library to rpath for nat
 
 option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)
 
+# To see what patches have been applied to LLD in this repository:
+# git log -p -- deps/lld
+option(ZIG_FORCE_EXTERNAL_LLD "If your system has the LLD patches use it instead of the embedded LLD" OFF)
 
 
 find_package(llvm)
@@ -31,8 +34,137 @@ link_directories(${LLVM_LIBDIRS})
 find_package(clang)
 include_directories(${CLANG_INCLUDE_DIRS})
 
-find_package(lld)
-include_directories(${LLD_INCLUDE_DIRS})
+if(ZIG_FORCE_EXTERNAL_LLD)
+    find_package(lld)
+    include_directories(${LLD_INCLUDE_DIRS})
+else()
+    set(EMBEDDED_LLD_LIB_SOURCES
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Driver/DarwinLdDriver.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Config/Version.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/LayoutPass.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ObjCPass.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/TLVPass.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileYAML.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/GOTPass.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ShimPass.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/WriterMachO.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/StubsPass.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/ReaderWriter/FileArchive.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/TargetOptionsCommandFlags.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/File.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Error.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/SymbolTable.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Reader.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Reproduce.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Writer.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/LinkingContext.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/Resolver.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/lib/Core/DefinedAtom.cpp"
+    )
+    set(EMBEDDED_LLD_ELF_SOURCES
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/ScriptLexer.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/AMDGPU.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/PPC.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/ARM.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/AVR.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/SPARCV9.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/Mips.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/AArch64.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/X86_64.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/PPC64.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/MipsArchTree.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Arch/X86.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/GdbIndex.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Driver.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Relocations.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Error.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/LTO.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Strings.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/ScriptParser.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/MarkLive.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/SyntheticSections.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/SymbolTable.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/LinkerScript.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/EhFrame.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Target.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Filesystem.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/OutputSections.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Symbols.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/ICF.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/InputFiles.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Thunks.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/DriverUtils.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/Writer.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/InputSection.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF/MapFile.cpp"
+    )
+    set(EMBEDDED_LLD_COFF_SOURCES
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/DLL.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Driver.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Chunks.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/PDB.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Error.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/LTO.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Strings.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/MarkLive.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/SymbolTable.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Symbols.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/ICF.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/InputFiles.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/DriverUtils.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/Writer.cpp"
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF/MapFile.cpp"
+    )
+    add_library(embedded_lld_lib ${EMBEDDED_LLD_LIB_SOURCES})
+    add_library(embedded_lld_elf ${EMBEDDED_LLD_ELF_SOURCES})
+    add_library(embedded_lld_coff ${EMBEDDED_LLD_COFF_SOURCES})
+    set_target_properties(embedded_lld_lib PROPERTIES
+        COMPILE_FLAGS "-std=c++11 -fno-exceptions -fno-rtti -Wno-comment"
+        LINK_FLAGS " "
+    )
+    set_target_properties(embedded_lld_elf PROPERTIES
+        COMPILE_FLAGS "-std=c++11 -fno-exceptions -fno-rtti -Wno-comment"
+        LINK_FLAGS " "
+    )
+    set_target_properties(embedded_lld_coff PROPERTIES
+        COMPILE_FLAGS "-std=c++11 -fno-exceptions -fno-rtti -Wno-comment"
+        LINK_FLAGS " "
+    )
+    target_include_directories(embedded_lld_lib PUBLIC
+        "${CMAKE_SOURCE_DIR}/deps/lld/include"
+        "${CMAKE_SOURCE_DIR}/deps/lld-prebuilt"
+    )
+    target_include_directories(embedded_lld_elf PUBLIC
+        "${CMAKE_SOURCE_DIR}/deps/lld/ELF"
+        "${CMAKE_SOURCE_DIR}/deps/lld/include"
+        "${CMAKE_SOURCE_DIR}/deps/lld-prebuilt/ELF"
+        "${CMAKE_SOURCE_DIR}/deps/lld-prebuilt"
+    )
+    target_include_directories(embedded_lld_coff PUBLIC
+        "${CMAKE_SOURCE_DIR}/deps/lld/COFF"
+        "${CMAKE_SOURCE_DIR}/deps/lld/include"
+        "${CMAKE_SOURCE_DIR}/deps/lld-prebuilt/COFF"
+        "${CMAKE_SOURCE_DIR}/deps/lld-prebuilt"
+    )
+    set(LLD_INCLUDE_DIRS "")
+    set(LLD_LIBRARIES
+        embedded_lld_elf
+        embedded_lld_coff
+        embedded_lld_lib
+    )
+endif()
 
 find_package(Threads)
 
@@ -65,26 +197,6 @@ set(ZIG_SOURCES
     "${CMAKE_SOURCE_DIR}/src/zig_llvm.cpp"
 )
 
-set(ZIG_HOST_LINK_VERSION)
-if (APPLE)
-    set(LD_V_OUTPUT)
-    execute_process(
-        COMMAND sh -c "${CMAKE_LINKER} -v 2>&1 | head -1"
-        RESULT_VARIABLE HAD_ERROR
-        OUTPUT_VARIABLE LD_V_OUTPUT
-    )
-    if (NOT HAD_ERROR)
-        if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*")
-            string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" ZIG_HOST_LINK_VERSION ${LD_V_OUTPUT})
-        elseif ("${LD_V_OUTPUT}" MATCHES "[^0-9]*([0-9.]+).*")
-            string(REGEX REPLACE "[^0-9]*([0-9.]+).*" "\\1" ZIG_HOST_LINK_VERSION ${LD_V_OUTPUT})
-        endif()
-    else()
-        message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}")
-    endif()
-endif()
-
-
 set(C_HEADERS_DEST "lib/zig/include")
 set(ZIG_STD_DEST "lib/zig/std")
 set(CONFIGURE_OUT_FILE "${CMAKE_BINARY_DIR}/config.h")
@@ -297,10 +409,10 @@ install(FILES "${CMAKE_SOURCE_DIR}/std/mem.zig" DESTINATION "${ZIG_STD_DEST}")
 install(FILES "${CMAKE_SOURCE_DIR}/std/net.zig" DESTINATION "${ZIG_STD_DEST}")
 install(FILES "${CMAKE_SOURCE_DIR}/std/os/child_process.zig" DESTINATION "${ZIG_STD_DEST}/os")
 install(FILES "${CMAKE_SOURCE_DIR}/std/os/darwin.zig" DESTINATION "${ZIG_STD_DEST}/os")
-install(FILES "${CMAKE_SOURCE_DIR}/std/os/darwin_x86_64.zig" DESTINATION "${ZIG_STD_DEST}/os")
-install(FILES "${CMAKE_SOURCE_DIR}/std/os/errno.zig" DESTINATION "${ZIG_STD_DEST}/os")
+install(FILES "${CMAKE_SOURCE_DIR}/std/os/darwin_errno.zig" DESTINATION "${ZIG_STD_DEST}/os")
 install(FILES "${CMAKE_SOURCE_DIR}/std/os/index.zig" DESTINATION "${ZIG_STD_DEST}/os")
 install(FILES "${CMAKE_SOURCE_DIR}/std/os/linux.zig" DESTINATION "${ZIG_STD_DEST}/os")
+install(FILES "${CMAKE_SOURCE_DIR}/std/os/linux_errno.zig" DESTINATION "${ZIG_STD_DEST}/os")
 install(FILES "${CMAKE_SOURCE_DIR}/std/os/linux_i386.zig" DESTINATION "${ZIG_STD_DEST}/os")
 install(FILES "${CMAKE_SOURCE_DIR}/std/os/linux_x86_64.zig" DESTINATION "${ZIG_STD_DEST}/os")
 install(FILES "${CMAKE_SOURCE_DIR}/std/os/path.zig" DESTINATION "${ZIG_STD_DEST}/os")

README.md

@@ -76,7 +76,7 @@ the Zig compiler itself:
 These libraries must be installed on your system, with the development files
 available. The Zig compiler links against them.
 
- * LLVM, Clang, and LLD libraries == 4.x
+ * LLVM, Clang, and LLD libraries == 5.x
 
 ### Debug / Development Build
 

ci/travis_linux_before_install

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+
+sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" >> /etc/apt/sources.list'
+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+sudo apt-get update -q

ci/travis_linux_install

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+
+sudo apt-get remove -y llvm-*
+sudo rm -rf /usr/local/*
+sudo apt-get install -y clang-5.0 libclang-5.0 libclang-5.0-dev llvm-5.0 llvm-5.0-dev liblld-5.0 liblld-5.0-dev cmake

ci/travis_linux_script

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -x
+
+export CC=clang-5.0
+export CXX=clang++-5.0
+which $CC
+which $CXX
+echo $PATH
+mkdir build
+cd build
+cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o)) -DZIG_FORCE_EXTERNAL_LLD=ON
+make VERBOSE=1
+make install
+./zig build --build-file ../build.zig test

ci/travis_osx_before_install

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -x
+
+brew update

ci/travis_osx_install

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -x
+
+brew install gcc@7
+brew outdated gcc@7 || brew upgrade gcc@7
+brew link --overwrite gcc@7
+
+SRC_DIR=$(pwd)
+PREFIX_DIR=$HOME/local/llvm5
+export CC=/usr/local/opt/gcc/bin/gcc-7
+export CXX=/usr/local/opt/gcc/bin/g++-7
+
+mkdir -p $HOME/local
+cd $HOME/local
+wget http://s3.amazonaws.com/superjoe/temp/llvm5.tar.xz
+tar xfp llvm5.tar.xz
+
+cd $SRC_DIR

ci/travis_osx_script

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -x
+
+PREFIX_DIR=$HOME/local/llvm5
+export CC=/usr/local/opt/gcc/bin/gcc-7
+export CXX=/usr/local/opt/gcc/bin/g++-7
+
+echo $PATH
+mkdir build
+cd build
+cmake .. -DCMAKE_PREFIX_PATH=$PREFIX_DIR -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o)) -DZIG_FORCE_EXTERNAL_LLD=ON
+make VERBOSE=1
+make install
+./zig build --build-file ../build.zig test

cmake/Findclang.cmake

@@ -8,14 +8,14 @@
 
 find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
     PATHS
-        /usr/lib/llvm-4.0/include
+        /usr/lib/llvm-5.0/include
         /mingw64/include)
 
     macro(FIND_AND_ADD_CLANG_LIB _libname_)
     string(TOUPPER ${_libname_} _prettylibname_)
     find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
         PATHS
-            /usr/lib/llvm-4.0/lib
+            /usr/lib/llvm-5.0/lib
             /mingw64/lib
             /c/msys64/mingw64/lib
             c:\\msys64\\mingw64\\lib)

cmake/Findlld.cmake

@@ -8,18 +8,18 @@
 
 find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h
     PATHS
-        /usr/lib/llvm-4.0/include
+        /usr/lib/llvm-5.0/include
         /mingw64/include)
 
-find_library(LLD_LIBRARY NAMES lld-4.0 lld PATHS /usr/lib/llvm-4.0/lib)
+find_library(LLD_LIBRARY NAMES lld-5.0 lld PATHS /usr/lib/llvm-5.0/lib)
 if(EXISTS ${LLD_LIBRARY})
     set(LLD_LIBRARIES ${LLD_LIBRARY})
 else()
     macro(FIND_AND_ADD_LLD_LIB _libname_)
         string(TOUPPER ${_libname_} _prettylibname_)
         find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
             PATHS
-                /usr/lib/llvm-4.0/lib
+                /usr/lib/llvm-5.0/lib
                 /mingw64/lib
                 /c/msys64/mingw64/lib
                 c:/msys64/mingw64/lib)

cmake/Findllvm.cmake

@@ -8,12 +8,12 @@
 # LLVM_LIBDIRS
 
 find_program(LLVM_CONFIG_EXE
-    NAMES llvm-config llvm-config-4.0
+    NAMES llvm-config llvm-config-5.0
     PATHS
         "/mingw64/bin"
         "/c/msys64/mingw64/bin"
         "c:/msys64/mingw64/bin"
-        "C:/Libraries/llvm-4.0.0/bin")
+        "C:/Libraries/llvm-5.0.0/bin")
 
 execute_process(
     COMMAND ${LLVM_CONFIG_EXE} --libs