Browse Source

Travis: No need to upgrade GCC for LLVM build

Luke Dashjr 11 years ago
parent
commit
9ad4abf8b0
2 changed files with 9 additions and 7 deletions
  1. 3 1
      .travis.script
  2. 6 6
      .travis.yml

+ 3 - 1
.travis.script

@@ -1,7 +1,9 @@
 test "x$1" = "xI-am-okay-with-destroying-my-system" || exit 1
 set -ex
 
-[ "$CC" = "clang" ] && CC=$(which "$CC")
+export CC=$(which "$myCC")
+$CC --version
+
 ./autogen.sh
 ./configure $GLOBAL_CONFIGURE_ARGS $CONFIGURE_ARGS
 make CFLAGS="$GLOBAL_CFLAGS $BUILD_CFLAGS" $MAKEOPTS

+ 6 - 6
.travis.yml

@@ -1,18 +1,18 @@
 os: linux
 language: c
-compiler:
-  - clang
-  - gcc
 env:
   global:
     - MAKEOPTS=-j3
     - GLOBAL_CFLAGS='-O2 -Wall'
     - GLOBAL_CONFIGURE_ARGS='--prefix=/usr'
-  matrix:
-    # Upgrade GCC to avoid false warnings; build the full project with -Werror
-    - UBUNTU_DEPS='gcc libhidapi-dev' EXTRA_DEPS='pkg-config libncursesw5-dev libudev-dev libusb-1.0-0-dev libevent-dev libmicrohttpd-dev libi2c-dev yasm' BUILD_CFLAGS='-Werror' CONFIGURE_ARGS='--enable-other-drivers --enable-scrypt'
 matrix:
   fast_finish: true
+  include:
+    - compiler: ": Full GCC"
+      # Upgrade GCC to avoid false warnings; build the full project with -Werror
+      env: myCC='gcc' UBUNTU_DEPS='gcc libhidapi-dev' EXTRA_DEPS='pkg-config libncursesw5-dev libudev-dev libusb-1.0-0-dev libevent-dev libmicrohttpd-dev libi2c-dev yasm' BUILD_CFLAGS='-Werror' CONFIGURE_ARGS='--enable-other-drivers --enable-scrypt'
+    - compiler: ": Full LLVM"
+      env: myCC='clang' UBUNTU_DEPS='libhidapi-dev' EXTRA_DEPS='pkg-config libncursesw5-dev libudev-dev libusb-1.0-0-dev libevent-dev libmicrohttpd-dev libi2c-dev yasm' BUILD_CFLAGS='-Werror' CONFIGURE_ARGS='--enable-other-drivers --enable-scrypt'
 install:
   - bash .travis.deps I-am-okay-with-destroying-my-system
 script: