From 29bfbddaac5fc340ffc5e5fdf33a32d2b5a6a069 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 3 Dec 2015 14:02:36 +0100 Subject: [PATCH] stupid me (nw) --- .travis.yml | 4 ++-- scripts/genie.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b669f47ccd7..3e6cf934542 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ env: script: - if [ $TRAVIS_OS_NAME == 'linux' ]; then if [ $CC == 'clang' ]; then - make -j2 linux_x64_clang CXX="g++-5" CC="gcc-5" && ./$MAME -validate; - else make -j2 OPTIMIZE=0 CXX="clang++-3.7" CC="clang-3.7" && ./$MAME -validate; + make -j2 linux_x64_clang CXX="clang++-3.7" CC="clang-3.7" && ./$MAME -validate; + else make -j2 OPTIMIZE=0 CXX="g++-5" CC="gcc-5" && ./$MAME -validate; fi elif [ $TRAVIS_OS_NAME == 'osx' ]; then unset LDOPTS && make -j2 OPTIMIZE=0 MACOSX_USE_LIBSDL=1 && ./$MAME -validate; diff --git a/scripts/genie.lua b/scripts/genie.lua index b16a5d97d53..94e79b62c29 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -966,7 +966,7 @@ end local version = str_to_version(_OPTIONS["gcc_version"]) if string.find(_OPTIONS["gcc"], "clang") then if (version < 30400) then - print("Clang version 3.5 or later needed") + print("Clang version 3.4 or later needed") os.exit(-1) end buildoptions {