]> granicus.if.org Git - recode/commitdiff
Travis: fix building with different versions of GCC
authorReuben Thomas <rrt@sc3d.org>
Sun, 19 Aug 2018 21:32:23 +0000 (22:32 +0100)
committerReuben Thomas <rrt@sc3d.org>
Sun, 19 Aug 2018 21:32:23 +0000 (22:32 +0100)
Install gcc, not g++ packages.

Set CC environment variable in ./configure call

.travis.yml

index df4ead618e46b630d38a5a7a9f896ec447a02b15..13974020d7452101b852d1b1cca563f8e3360819 100644 (file)
@@ -24,7 +24,7 @@ matrix:
   include:
     - os: linux
       env:
-        - COMPILER=g++-5
+        - COMPILER=gcc-5
         - PYTHON=/usr/bin/python-dbg
         - DISTCHECK_CONFIGURE_FLAGS="PYTHON=/usr/bin/python-dbg"
     - os: osx
@@ -34,7 +34,7 @@ matrix:
         - CPPFLAGS="-I/usr/local/opt/flex/include"
     - compiler: gcc
       env:
-        - COMPILER=g++-6
+        - COMPILER=gcc-6
       addons:
         apt:
           sources:
@@ -56,7 +56,7 @@ install:
 
 script:
   - ./bootstrap
-  - ./configure --enable-silent-rules
+  - ./configure --enable-silent-rules CC=$COMPILER
   - make
   # The Cython-built Python extension doesn’t work without make install on macOS
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make install && make check ; else make distcheck ; fi