From 419a14a63f6fa1d466e98a8f0b2886c3512631da Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 28 May 2015 15:19:44 +0800 Subject: [PATCH] Use gcc-4.8 on CI machine --- script/cibuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/script/cibuild b/script/cibuild index 7077358..b5798a9 100755 --- a/script/cibuild +++ b/script/cibuild @@ -15,6 +15,8 @@ LINUX_DEPS = [ 'libgnome-keyring-dev', 'libgtk2.0-dev', 'libnotify-dev', + 'gcc-4.8', + 'g++-4.8', 'gcc-multilib', 'g++-multilib', ] @@ -26,6 +28,7 @@ def main(): is_travis = (os.getenv('TRAVIS') == 'true') if is_travis and sys.platform == 'linux2': print 'Setup travis CI' + execute(['sudo', 'add-apt-repository', '-y', 'ppa:ubuntu-toolchain-r/test']) execute(['sudo', 'apt-get', 'update']) execute(['sudo', 'apt-get', 'install'] + LINUX_DEPS) @@ -41,8 +44,8 @@ def main(): 'libchromiumcontent')) if is_travis and sys.platform == 'linux2': - with scoped_env('CXX', 'g++'): - with scoped_env('CC', 'gcc'): + with scoped_env('CXX', 'g++-4.8'): + with scoped_env('CC', 'gcc-4.8'): run_script('bootstrap.py', ['--dev']) run_script('update.py') else: -- 2.7.4