Merge pull request numba#404 from stuartarchibald/wip/llvm7

Move to LLVM 7
stuartarchibald · Oct 26, 2018 · ebc4c59 · ebc4c59
2 parents a52ca0d + 717860f
commit ebc4c59
Show file tree

Hide file tree

Showing 14 changed files with 1,988 additions and 895 deletions.
diff --git a/README.rst b/README.rst
@@ -70,7 +70,8 @@ Historical compatibility table:
 =================  ========================
 llvmlite versions  compatible LLVM versions
 =================  ========================
-0.23.0 - ...       6.0.x
+0.26.0 - ...       7.0.x
+0.23.0 - 0.25.0    6.0.x
 0.21.0 - 0.22.0    5.0.x
 0.17.0 - 0.20.0    4.0.x
 0.16.0 - 0.17.0    3.9.x

diff --git a/buildscripts/incremental/setup_conda_environment.cmd b/buildscripts/incremental/setup_conda_environment.cmd
@@ -17,6 +17,6 @@ conda create -n %CONDA_ENV% -q -y python=%PYTHON% cmake
 
 call activate %CONDA_ENV%
 @rem Install llvmdev
-%CONDA_INSTALL% -c numba llvmdev="6.0*"
+%CONDA_INSTALL% -c numba llvmdev="7.0*"
 @rem Install enum34 for Python < 3.4
 if %PYTHON% LSS 3.4 (%CONDA_INSTALL% enum34)
diff --git a/buildscripts/incremental/setup_conda_environment.sh b/buildscripts/incremental/setup_conda_environment.sh
@@ -25,7 +25,7 @@ source activate $CONDA_ENV
 set -v
 
 # Install llvmdev (separate channel, for now)
-$CONDA_INSTALL -c numba llvmdev="6.0*"
+$CONDA_INSTALL -c numba llvmdev="7.0*"
 
 # Install the compiler toolchain, for osx, bootstrapping needed
 # which happens in build.sh

diff --git a/conda-recipes/0001-Transforms-Add-missing-header-for-InstructionCombini.patch b/conda-recipes/0001-Transforms-Add-missing-header-for-InstructionCombini.patch