diff options
| -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 |