Merge 3a457f6 into 4021009

phanrahan · Apr 2, 2019 · ee874d7 · ee874d7
2 parents 4021009 + 3a457f6
commit ee874d7
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.travis/install_coreir.sh b/.travis/install_coreir.sh
@@ -10,11 +10,13 @@ if [ "$TRAVIS_BRANCH" == "coreir-dev" ]; then
     cd deps;
     git clone -b dev https://github.com/rdaly525/coreir.git;
     cd coreir;
-    export COREIRCONFIG="g++-4.9";
-    export COREIR=$PWD;
-    make install prefix=$TRAVIS_BUILD_DIR/deps;
-    cd ..;
-    cd ..;
+    export CXX="g++-4.9";
+    cd build
+    cmake -DCMAKE_INSTALL_PREFIX:PATH=$TRAVIS_BUILD_DIR/deps ..
+    make install;
+    cd ..;  # build
+    cd ..;  # coreir
+    cd ..;  # deps
     export PATH=$TRAVIS_BUILD_DIR/deps/bin:$PATH;
     export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/deps/lib:$LD_LIBRARY_PATH;
     pip install --upgrade git+git://github.com/leonardt/pycoreir.git@dev;