summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2017-01-25 09:14:29 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2017-01-25 09:14:29 +0100
commit58901ac73ba0eaa71ed5d395890eac8e37b07be0 (patch)
tree23f39b88f3c68dbfa9a96942b0eff6aa4f1d6547 /.travis.yml
parent0c773d22e56bfdf53668d7f61dbdee8f773bdc3f (diff)
downloadATCD-58901ac73ba0eaa71ed5d395890eac8e37b07be0.tar.gz
Enable clang support
* .travis.yml:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 9c2f20e11a4..bc4bb706850 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ os:
compiler:
- gcc
+ - clang
+
env:
matrix:
- FUZZ=1
@@ -57,7 +59,8 @@ before_script:
- echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features
- echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_macosx.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
- - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
+ - if [ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
+ - if [ "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "clang++" ]; then echo -e "include \$(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU; fi
- cat $TRAVIS_BUILD_DIR/travis.mwc
- cat $ACE_ROOT/bin/MakeProjectCreator/config/default.features
- cat $ACE_ROOT/ace/config.h