diff options
author | Jimmy Huang <jimmy.huang@linux.intel.com> | 2018-01-12 15:12:59 -0800 |
---|---|---|
committer | Geoff Gustafson <geoff@linux.intel.com> | 2018-01-12 15:12:59 -0800 |
commit | 3623842f356d9f343aef8a40842178f084d8c5f0 (patch) | |
tree | 4e41ed5e536e0ec7bd8e7fc0ed0ece330f24e31c | |
parent | 8c083c3e156b88a074a76cfb5543116196c4fb64 (diff) |
[build] Fix incorrect GCC version set for Mac builds on Travis (#1760)
GCC5 should only be needed on Ubuntu 14.04 builds, not MacOS
since it uses clang.
Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>
-rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index a840dad..fe2aaf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,10 +75,10 @@ install: > before_script: > source zjs-env.sh && - if [ "$TARGET" != "linux" ]; then + if [[ "$TARGET" != "linux" ]]; then make update && source deps/zephyr/zephyr-env.sh; - else + elif [[ "$TRAVIS_OS_NAME" != "osx" ]]; then export CXX="g++-5" CC="gcc-5"; fi |