diff --git a/.travis.yml b/.travis.yml index a5575d451..4c74a5dfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,9 @@ before_install: script: # ALL THE BUILD COMMANDS HERE - - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then mk/linux/build-zg.sh; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ] && [ "$Tr_Compiler_Version" != "6" ]; then mk/linux/build-zg.sh; fi + # use gcc 6 to test build using embedded libs, add -z option + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ] && [ "$Tr_Compiler_Version" = "6" ]; then mk/linux/build-zg.sh -e; fi - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then mk/linux/build-zg.sh -w; fi # ^ -w may be removed on more modern dist: than trusty, problems related with 'new wx+clang+old gcc' - if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macos/build-zg.sh; fi