Restore clang builds in travis.yml

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2016-06-30 08:51:16 -04:00
parent 8e21938ce3
commit 6f60a5a1c6

View file

@ -5,13 +5,13 @@ addons:
apt: apt:
packages: packages:
- ccache - ccache
# - clang-3.6 - clang-3.6
- gcc-5 - gcc-5
- binutils-mingw-w64 - binutils-mingw-w64
- gcc-mingw-w64 - gcc-mingw-w64
- wine - wine
sources: sources:
# - llvm-toolchain-precise-3.6 - llvm-toolchain-precise-3.6
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
os: os:
@ -32,21 +32,17 @@ env:
matrix: matrix:
include: include:
- os: linux - os: linux
compiler: clang compiler: clang-3.6
env: CONFIG_OPTS="no-shared enable-asan" env: CONFIG_OPTS="no-shared enable-asan"
# - os: linux - os: linux
# compiler: clang-3.6 compiler: clang-3.6
# compiler: clang env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -fno-sanitize=alignment"
# env: CONFIG_OPTS="no-shared enable-asan" - os: linux
# - os: linux compiler: clang-3.6
# compiler: clang-3.6 env: CONFIG_OPTS="no-shared no-asm enable-asan enable-rc5 enable-md2"
# env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -fno-sanitize=alignment"
- os: linux - os: linux
compiler: gcc-5 compiler: gcc-5
env: CONFIG_OPTS="no-shared no-asm enable-rc5 enable-md2" env: CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 -DPEDANTIC"
- os: linux
compiler: gcc-5
env: CONFIG_OPTS="no-asm enable-rc5 enable-md2 -DPEDANTIC"
- os: linux - os: linux
compiler: i686-w64-mingw32-gcc compiler: i686-w64-mingw32-gcc
env: CONFIG_OPTS="no-pic" env: CONFIG_OPTS="no-pic"