aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorPjotr Prins2017-08-27 07:56:19 +0000
committerPjotr Prins2017-08-27 08:00:18 +0000
commit3268896c20735ca9aa3c733c687ef6bbed760bcc (patch)
tree0b7cb819f103e1d6e5673acef0e4687d6089c721 /.travis.yml
parenta5e0b3eb45a3d9bbf8760c49c9ac4f54817a2974 (diff)
downloadpangemma-3268896c20735ca9aa3c733c687ef6bbed760bcc.tar.gz
Makefile: clean up of the main Makefile and changed build instructions
to align with normal build systems * Debug mode is now the default (use DEBUG= to disable) * Dynamic linking is now the default (use FORCE_STATIC=1 for static) * Removed references to 32-bit compilation (default is $arch)
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index df74fb2..ec2d049 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,12 +35,12 @@ script:
- eval "${MATRIX_EVAL}"
- $CXX --version
# build and test debug version
- - make CXX=$CXX FORCE_DYNAMIC=1 WITH_OPENBLAS=1 DEBUG=1 -j 4
- - time make CXX=$CXX FORCE_DYNAMIC=1 WITH_OPENBLAS=1 DEBUG=1 check
+ - make CXX=$CXX WITH_OPENBLAS=1 -j 4
+ - time make CXX=$CXX WITH_OPENBLAS=1 check
- make clean
# build and test release version
- make CXX=$CXX FORCE_DYNAMIC=1 WITH_OPENBLAS=1 -j 4
- - time make CXX=$CXX FORCE_DYNAMIC=1 WITH_OPENBLAS=1 check
+ - time make CXX=$CXX WITH_OPENBLAS=1 DEBUG= check
# build static release (fast-check only)
# - make clean
# - make CXX=$CXX TRAVIS_CI=1 -j 4 fast-check