mirror of
https://github.com/xenia-project/xenia.git
synced 2024-12-02 16:47:01 +00:00
travis: clang-3.9
This commit is contained in:
parent
7fb31462e4
commit
50cc2385dd
12
.travis.yml
12
.travis.yml
@ -22,11 +22,11 @@ sudo: required
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-precise
|
||||
# - ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-precise-3.9
|
||||
packages:
|
||||
- clang-3.8
|
||||
- clang-format-3.8
|
||||
- clang-3.9
|
||||
- clang-format-3.9
|
||||
- libc++-dev
|
||||
|
||||
git:
|
||||
@ -37,8 +37,8 @@ before_install:
|
||||
# Nothing!
|
||||
|
||||
before_script:
|
||||
- export CXX=clang++-3.8
|
||||
- export CC=clang-3.8
|
||||
- export CXX=clang++-3.9
|
||||
- export CC=clang-3.9
|
||||
# Dump useful info.
|
||||
- $CXX --version
|
||||
# Prepare environment (pull dependencies, build tools).
|
||||
|
@ -41,6 +41,10 @@ def main():
|
||||
sys.exit(1)
|
||||
return
|
||||
|
||||
if sys.platform == 'win32':
|
||||
# Append the executable extension on windows.
|
||||
premake5_bin = premake5_bin + '.exe'
|
||||
|
||||
return_code = shell_call([
|
||||
premake5_bin,
|
||||
'--scripts=%s' % (premake_path),
|
||||
@ -91,13 +95,15 @@ def has_bin(bin):
|
||||
"""Checks whether the given binary is present.
|
||||
"""
|
||||
for path in os.environ["PATH"].split(os.pathsep):
|
||||
path = path.strip('"')
|
||||
exe_file = os.path.join(path, bin)
|
||||
if os.path.isfile(exe_file) and os.access(exe_file, os.X_OK):
|
||||
return True
|
||||
exe_file = exe_file + '.exe'
|
||||
if os.path.isfile(exe_file) and os.access(exe_file, os.X_OK):
|
||||
return True
|
||||
if sys.platform == 'win32':
|
||||
exe_file = os.path.join(path, bin + '.exe')
|
||||
if os.path.isfile(exe_file) and os.access(exe_file, os.X_OK):
|
||||
return True
|
||||
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):
|
||||
return True
|
||||
return None
|
||||
|
||||
|
||||
|
@ -607,6 +607,7 @@ class BaseBuildCommand(Command):
|
||||
|
||||
result = subprocess.call([
|
||||
'make',
|
||||
'-j',
|
||||
'-Cbuild/',
|
||||
'config=%s_linux' % (args['config']),
|
||||
] + pass_args + args['target'], shell=False)
|
||||
|
Loading…
Reference in New Issue
Block a user