Fix for Travis compiling C file with g++/clang++

wesnoth · Sep 8, 2016 · 8e8cbfb · 8e8cbfb
1 parent 7950faf
commit 8e8cbfb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -53,6 +53,7 @@ install:
     - if [ "$CXXSTD" == "1y" ]; then
           sudo apt-get install -qq g++-5;
           export CXX=g++-5;
+          export CC=gcc-5;
       fi
 
 script: 
@@ -62,7 +63,7 @@ script:
     - if [ "$USE_CMAKE" = true  ]; then
           cmake . -DENABLE_STRICT_COMPILATION=$STRICT_COMPILATION -DENABLE_NLS=$NLS -DENABLE_TESTS=$CPP_TESTS && make VERBOSE=1 -j2;
       else
-          scons cxxtool=$CXX --debug=time build=release extra_flags_config=-pipe extra_flags_release="$EXTRA_FLAGS_RELEASE" strict=$STRICT_COMPILATION $TARGETS cxx_std=$CXXSTD nls=$NLS jobs=2;
+          scons cxxtool=$CXX ctool=$CC --debug=time build=release extra_flags_config=-pipe extra_flags_release="$EXTRA_FLAGS_RELEASE" strict=$STRICT_COMPILATION $TARGETS cxx_std=$CXXSTD nls=$NLS jobs=2;
       fi
     - "export DISPLAY=:99.0"
     - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24"