travis: clang-3.9

This commit is contained in:
Dr. Chat 2017-02-05 22:01:13 -06:00
parent 7fb31462e4
commit 50cc2385dd
3 changed files with 20 additions and 13 deletions

View File

@ -22,11 +22,11 @@ sudo: required
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test # - ubuntu-toolchain-r-test
- llvm-toolchain-precise - llvm-toolchain-precise-3.9
packages: packages:
- clang-3.8 - clang-3.9
- clang-format-3.8 - clang-format-3.9
- libc++-dev - libc++-dev
git: git:
@ -37,8 +37,8 @@ before_install:
# Nothing! # Nothing!
before_script: before_script:
- export CXX=clang++-3.8 - export CXX=clang++-3.9
- export CC=clang-3.8 - export CC=clang-3.9
# Dump useful info. # Dump useful info.
- $CXX --version - $CXX --version
# Prepare environment (pull dependencies, build tools). # Prepare environment (pull dependencies, build tools).

View File

@ -41,6 +41,10 @@ def main():
sys.exit(1) sys.exit(1)
return return
if sys.platform == 'win32':
# Append the executable extension on windows.
premake5_bin = premake5_bin + '.exe'
return_code = shell_call([ return_code = shell_call([
premake5_bin, premake5_bin,
'--scripts=%s' % (premake_path), '--scripts=%s' % (premake_path),
@ -91,11 +95,13 @@ def has_bin(bin):
"""Checks whether the given binary is present. """Checks whether the given binary is present.
""" """
for path in os.environ["PATH"].split(os.pathsep): for path in os.environ["PATH"].split(os.pathsep):
path = path.strip('"') if sys.platform == 'win32':
exe_file = os.path.join(path, bin) exe_file = os.path.join(path, bin + '.exe')
if os.path.isfile(exe_file) and os.access(exe_file, os.X_OK): if os.path.isfile(exe_file) and os.access(exe_file, os.X_OK):
return True return True
exe_file = exe_file + '.exe' else:
path = path.strip('"')
exe_file = os.path.join(path, bin)
if os.path.isfile(exe_file) and os.access(exe_file, os.X_OK): if os.path.isfile(exe_file) and os.access(exe_file, os.X_OK):
return True return True
return None return None

View File

@ -607,6 +607,7 @@ class BaseBuildCommand(Command):
result = subprocess.call([ result = subprocess.call([
'make', 'make',
'-j',
'-Cbuild/', '-Cbuild/',
'config=%s_linux' % (args['config']), 'config=%s_linux' % (args['config']),
] + pass_args + args['target'], shell=False) ] + pass_args + args['target'], shell=False)