Set the compiler in travis build script

numba · Dec 6, 2018 · 489e804 · 489e804
1 parent 635871b
commit 489e804
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/buildscripts/incremental/install_miniconda.sh b/buildscripts/incremental/install_miniconda.sh
@@ -6,6 +6,10 @@ if [[ "$unamestr" == 'Linux' ]]; then
   wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
 elif [[ "$unamestr" == 'Darwin' ]]; then
   wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
+  # use system clang in travis ci to avoid linking issues
+  # see https://github.com/bigartm/bigartm/issues/910
+  export CC=clang
+  export CXX=clang++
 else
   echo Error
 fi

diff --git a/ffi/build.py b/ffi/build.py
@@ -151,7 +151,7 @@ def main_posix(kind, library_ext):
             for lname in libs.split('-l') \
             if lname and 'LLVMCore' not in lname
             and 'LLVMSupport' not in lname]
-        # cxxflags.append(' '.join(excluded))
+        cxxflags.append(' '.join(excluded))
     # look for SVML
     include_dir = run_llvm_config(llvm_config, ['--includedir']).strip()
     svml_indicator = os.path.join(include_dir, 'llvm', 'IR', 'SVML.gen')
@@ -186,7 +186,7 @@ def build_passes():
                 generator = find_win32_generator()
                 try_cmake('..', '.', generator)
 
-            subprocess.check_call(['cmake', '--build', '.', '--config', 'Debug'])
+            subprocess.check_call(['cmake', '--build', '.', '--config', 'Release'])
             shutil.copy(os.path.join("hello", hello_pass_library), target_dir)
 
 

diff --git a/ffi/passes/CMakeLists.txt b/ffi/passes/CMakeLists.txt
@@ -1,12 +1,5 @@
 cmake_minimum_required(VERSION 3.2)
 
-if (APPLE AND "$ENV{CONDA_ENV}" STREQUAL "travisci")
-    # use system clang in travis ci to avoid linking issues
-    # see https://github.com/bigartm/bigartm/issues/910
-    set(CMAKE_CXX_COMPILER clang++)
-    set(CMAKE_C_COMPILER clang)
-endif()
-
 find_package(LLVM REQUIRED CONFIG)
 
 add_definitions(${LLVM_DEFINITIONS})
@@ -24,3 +17,4 @@ endif()
 include_directories(${LLVM_INCLUDE_DIRS})
 
 add_subdirectory(hello)
+add_subdirectory(refcntopt)