diff options
| author | Jack Lloyd <[email protected]> | 2016-06-07 09:24:06 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-06-07 09:24:06 -0400 |
| commit | 6816c9e71e01432792a997ad9a5d561b9cd94a48 (patch) | |
| tree | d28b758626ab83a306cef890c3a6d2ccbabe21d7 | |
| parent | a025e78f737d171848cd9b83fe567f0763d890f4 (diff) | |
Fix CircleCI build
The LLVM apt mirror was removed due to excessive load, preventing
us from installing a new enough Clang for our needs. However CircleCI
also supports Ubuntu 14.04 images, instead of the Ubuntu 12 we were
on. The new version has GCC 4.8 and Clang 3.4 as the base install.
Removes UBSan from the CircleCI sanitizer build, since that requires
at least GCC 4.9
GH #498
| -rw-r--r-- | circle.yml | 8 | ||||
| -rwxr-xr-x | src/scripts/ci/circle/gcc-sanitizer.sh | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/circle.yml b/circle.yml index 48688eb60..125fd0fcb 100644 --- a/circle.yml +++ b/circle.yml @@ -1,14 +1,8 @@ dependencies: pre: - - sudo add-apt-repository -y 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.6 main' - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - wget -q -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - sudo apt-get update -qq - override: - - sudo apt-get install g++-4.9 clang-3.6 + - sudo apt-get install clang post: - - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 99 - - sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 99 - g++ --version - clang++ --version diff --git a/src/scripts/ci/circle/gcc-sanitizer.sh b/src/scripts/ci/circle/gcc-sanitizer.sh index 33d474fc6..27d7268d9 100755 --- a/src/scripts/ci/circle/gcc-sanitizer.sh +++ b/src/scripts/ci/circle/gcc-sanitizer.sh @@ -5,7 +5,6 @@ which shellcheck > /dev/null && shellcheck "$0" # Run shellcheck on this if avai BUILD_NICKNAME=$(basename "$0" .sh) BUILD_DIR="./build-$BUILD_NICKNAME" -# Adding Ubsan here, only added in GCC 4.9 -./configure.py --with-build-dir="$BUILD_DIR" --with-debug-info --with-sanitizer --cc-abi-flags='-fsanitize=undefined' +./configure.py --with-build-dir="$BUILD_DIR" --with-debug-info --with-sanitizer make -j 2 -f "$BUILD_DIR"/Makefile "$BUILD_DIR"/botan-test |