diff --git a/.travis.yml b/.travis.yml index a582da5666d..9ca2e07d7be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ env: script: - if [ $TRAVIS_OS_NAME == 'linux' ]; then if [ $CC == 'clang' ]; then - make -j2 OVERRIDE_CXX="clang++-3.6" OVERRIDE_CC="clang-3.6" && ./$MAME -validate; - else make -j4 OPTIMIZE=0 OVERRIDE_CC="gcc-5" OVERRIDE_CXX="g++-5" && ./$MAME -validate; + make -j2 IGNORE_GIT=1 OVERRIDE_CXX="clang++-3.6" OVERRIDE_CC="clang-3.6" && ./$MAME -validate; + else make -j4 IGNORE_GIT=1 OPTIMIZE=0 OVERRIDE_CC="gcc-5" OVERRIDE_CXX="g++-5" && ./$MAME -validate; fi elif [ $TRAVIS_OS_NAME == 'osx' ]; then unset LDOPTS && make -j2 OPTIMIZE=0 USE_LIBSDL=1 && ./$MAME -validate; @@ -43,4 +43,4 @@ branches: - master notifications: email: false - \ No newline at end of file + diff --git a/makefile b/makefile index c8f64b998dc..1bc1f5dc971 100644 --- a/makefile +++ b/makefile @@ -906,6 +906,9 @@ NEW_GIT_VERSION := $(shell git describe --dirty) else NEW_GIT_VERSION := unknown endif +ifeq ($(NEW_GIT_VERSION),) +NEW_GIT_VERSION := unknown +endif GENIE := 3rdparty/genie/bin/$(GENIEOS)/genie$(EXE)