diff --git a/README.md b/README.md index d3a64abba3..71e77d6c40 100644 --- a/README.md +++ b/README.md @@ -87,14 +87,14 @@ that counts as "freestanding" for the purposes of this table. * cmake >= 2.8.5 * gcc >= 5.0.0 or clang >= 3.6.0 - * LLVM, Clang, LLD development libraries == 7.x, compiled with the same gcc or clang version above + * LLVM, Clang, LLD development libraries == 8.x, compiled with the same gcc or clang version above - These depend on zlib and libxml2. ##### Windows * cmake >= 2.8.5 - * Microsoft Visual Studio 2015 - * LLVM, Clang, LLD development libraries == 7.x, compiled with the same MSVC version above + * Microsoft Visual Studio 2017 (version 15.8) + * LLVM, Clang, LLD development libraries == 8.x, compiled with the same MSVC version above #### Instructions @@ -112,11 +112,11 @@ bin/zig build --build-file ../build.zig test ##### MacOS ``` -brew install cmake llvm@7 -brew outdated llvm@7 || brew upgrade llvm@7 +brew install cmake llvm@8 +brew outdated llvm@8 || brew upgrade llvm@8 mkdir build cd build -cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@7/ +cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@8/ make install bin/zig build --build-file ../build.zig test ``` diff --git a/ci/appveyor/appveyor.yml b/ci/appveyor/appveyor.yml index 8358fa52d3..1401861deb 100644 --- a/ci/appveyor/appveyor.yml +++ b/ci/appveyor/appveyor.yml @@ -7,3 +7,4 @@ after_build: - '%APPVEYOR_BUILD_FOLDER%\ci\appveyor\after_build.bat' cache: - 'llvm+clang-7.0.0-win64-msvc-release.tar.xz' + - 'llvm+clang-8.0.0-win64-msvc-release.tar.xz' diff --git a/ci/appveyor/build_script.bat b/ci/appveyor/build_script.bat index 0a2745365d..8012ec8738 100644 --- a/ci/appveyor/build_script.bat +++ b/ci/appveyor/build_script.bat @@ -7,13 +7,13 @@ SET "PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%" SET "MSYSTEM=MINGW64" SET "APPVEYOR_CACHE_ENTRY_ZIP_ARGS=-m0=Copy" -bash -lc "cd ${APPVEYOR_BUILD_FOLDER} && if [ -s ""llvm+clang-7.0.0-win64-msvc-release.tar.xz"" ]; then echo 'skipping LLVM download'; else wget 'https://s3.amazonaws.com/ziglang.org/deps/llvm%%2bclang-7.0.0-win64-msvc-release.tar.xz'; fi && tar xf llvm+clang-7.0.0-win64-msvc-release.tar.xz" || exit /b +bash -lc "cd ${APPVEYOR_BUILD_FOLDER} && if [ -s ""llvm+clang-8.0.0-win64-msvc-release.tar.xz"" ]; then echo 'skipping LLVM download'; else wget 'https://s3.amazonaws.com/ziglang.org/deps/llvm%%2bclang-8.0.0-win64-msvc-release.tar.xz'; fi && tar xf llvm+clang-8.0.0-win64-msvc-release.tar.xz" || exit /b SET "PATH=%PREVPATH%" SET "MSYSTEM=%PREVMSYSTEM%" SET "ZIGBUILDDIR=%APPVEYOR_BUILD_FOLDER%\build-msvc-release" -SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-7.0.0-win64-msvc-release" +SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-8.0.0-win64-msvc-release" call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 call "C:\Program Files (x86)\Microsoft Visual Studio 15.0\VC\vcvarsall.bat" x86_amd64 diff --git a/ci/travis_linux_before_install b/ci/travis_linux_before_install index 7a3043be3a..bd160d7a07 100755 --- a/ci/travis_linux_before_install +++ b/ci/travis_linux_before_install @@ -2,7 +2,7 @@ set -x -sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-7 main" >> /etc/apt/sources.list' +sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-8 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 diff --git a/ci/travis_linux_install b/ci/travis_linux_install index ea2e931e6f..8f1e3ef49d 100755 --- a/ci/travis_linux_install +++ b/ci/travis_linux_install @@ -4,4 +4,4 @@ set -x sudo apt-get remove -y llvm-* sudo rm -rf /usr/local/* -sudo apt-get install -y libxml2-dev libclang-7-dev llvm-7 llvm-7-dev cmake s3cmd gcc-7 g++-7 +sudo apt-get install -y libxml2-dev libclang-8-dev llvm-8 llvm-8-dev cmake s3cmd gcc-7 g++-7 diff --git a/ci/travis_linux_script b/ci/travis_linux_script index 54a3f0bb97..1bbab10684 100755 --- a/ci/travis_linux_script +++ b/ci/travis_linux_script @@ -14,7 +14,7 @@ make -j2 install if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then mkdir $TRAVIS_BUILD_DIR/artifacts - docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR/artifacts",target=/z ziglang/static-base:llvm7-1 -j2 $TRAVIS_COMMIT + docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR/artifacts",target=/z ziglang/static-base:llvm8-1 -j2 $TRAVIS_COMMIT echo "access_key = $AWS_ACCESS_KEY_ID" >> ~/.s3cfg echo "secret_key = $AWS_SECRET_ACCESS_KEY" >> ~/.s3cfg s3cmd put -P $TRAVIS_BUILD_DIR/artifacts/* s3://ziglang.org/builds/ diff --git a/ci/travis_osx_install b/ci/travis_osx_install index 2ad5e485c3..6d70229527 100755 --- a/ci/travis_osx_install +++ b/ci/travis_osx_install @@ -2,6 +2,6 @@ set -x -brew install llvm@7 -brew outdated llvm@7 || brew upgrade llvm@7 +brew install llvm@8 +brew outdated llvm@8 || brew upgrade llvm@8 diff --git a/ci/travis_osx_script b/ci/travis_osx_script index 69c026f3a2..fb4cd6bfb6 100755 --- a/ci/travis_osx_script +++ b/ci/travis_osx_script @@ -5,7 +5,7 @@ set -e mkdir build cd build -cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@7/ -DCMAKE_BUILD_TYPE=Release +cmake .. -DCMAKE_PREFIX_PATH=/usr/local/opt/llvm@8/ -DCMAKE_BUILD_TYPE=Release make VERBOSE=1 make install diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index ea1bc91d7b..886b7232a8 100644 --- a/cmake/Findclang.cmake +++ b/cmake/Findclang.cmake @@ -27,9 +27,9 @@ if(MSVC) else() find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h PATHS - /usr/lib/llvm/7/include - /usr/lib/llvm-7/include - /usr/lib/llvm-7.0/include + /usr/lib/llvm/8/include + /usr/lib/llvm-8/include + /usr/lib/llvm-8.0/include /mingw64/include) macro(FIND_AND_ADD_CLANG_LIB _libname_) @@ -37,9 +37,9 @@ else() find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} PATHS ${CLANG_LIBDIRS} - /usr/lib/llvm/7/lib - /usr/lib/llvm-7/lib - /usr/lib/llvm-7.0/lib + /usr/lib/llvm/8/lib + /usr/lib/llvm-8/lib + /usr/lib/llvm-8.0/lib /mingw64/lib /c/msys64/mingw64/lib c:\\msys64\\mingw64\\lib) diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake index 1c4e9163a3..d9aa4487de 100644 --- a/cmake/Findlld.cmake +++ b/cmake/Findlld.cmake @@ -8,10 +8,10 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h PATHS - /usr/lib/llvm-6.0/include + /usr/lib/llvm-8.0/include /mingw64/include) -find_library(LLD_LIBRARY NAMES lld-6.0 lld PATHS /usr/lib/llvm-6.0/lib) +find_library(LLD_LIBRARY NAMES lld-8.0 lld PATHS /usr/lib/llvm-8.0/lib) if(EXISTS ${LLD_LIBRARY}) set(LLD_LIBRARIES ${LLD_LIBRARY}) else() @@ -19,7 +19,7 @@ else() string(TOUPPER ${_libname_} _prettylibname_) find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} PATHS - /usr/lib/llvm-6.0/lib + /usr/lib/llvm-8.0/lib /mingw64/lib /c/msys64/mingw64/lib c:/msys64/mingw64/lib) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index 9a4fa3f31c..4e22995c93 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -8,12 +8,12 @@ # LLVM_LIBDIRS find_program(LLVM_CONFIG_EXE - NAMES llvm-config llvm-config-7 llvm-config-7.0 + NAMES llvm-config llvm-config-8 llvm-config-8.0 PATHS "/mingw64/bin" "/c/msys64/mingw64/bin" "c:/msys64/mingw64/bin" - "C:/Libraries/llvm-7.0.0/bin") + "C:/Libraries/llvm-8.0.0/bin") if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC) execute_process( @@ -62,7 +62,7 @@ execute_process( set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) if(NOT LLVM_LIBRARIES) - find_library(LLVM_LIBRARIES NAMES LLVM LLVM-7 LLVM-7.0) + find_library(LLVM_LIBRARIES NAMES LLVM LLVM-8 LLVM-8.0) endif() link_directories("${CMAKE_PREFIX_PATH}/lib")