From 27dd6dd3dbe92debaac7d54c8405a3d3af1c4daf Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 18 Sep 2015 10:19:23 -0700 Subject: Tweak Travis to use GCE Travis CI has new infrastructure using the Google Compute Engine which has both faster CPUs and more memory, and we've been encouraged to switch as it should help our build times! The only downside currently, however, is that IPv6 is disabled, causing a number of standard library tests to fail. Consequently this commit tweaks our travis config in a few ways: * ccache is disabled as it's not working on GCE just yet * Docker is used to run tests inside which reportedly will get IPv6 working * A system LLVM installation is used instead of building LLVM itself. This is primarily done to reduce build times, but we want automation for this sort of behavior anyway and we can extend this in the future with building from source as well if needed. * gcc-specific logic is removed as the docker image for Ubuntu gives us a recent-enough gcc by default. --- src/rustllvm/RustWrapper.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/rustllvm/RustWrapper.cpp') diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 5007af0e777..9ce34c40730 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -951,10 +951,5 @@ LLVMRustBuildLandingPad(LLVMBuilderRef Builder, unsigned NumClauses, const char* Name, LLVMValueRef F) { -#if LLVM_VERSION_MINOR >= 7 - unwrap(F)->setPersonalityFn(unwrap(PersFn)); - return LLVMBuildLandingPad(Builder, Ty, NumClauses, Name); -#else return LLVMBuildLandingPad(Builder, Ty, PersFn, NumClauses, Name); -#endif } -- cgit 1.4.1-3-g733a5