diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-18 23:39:58 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2020-02-19 05:10:00 +0100 |
| commit | 749968c3eb92a6043ccb1f5f49d39fc2823a57d8 (patch) | |
| tree | 698057f1c9c816f833094e983807de2efc53a71c | |
| parent | 6f65d24796a0aaca0c20f4c074aa71e39f38e68d (diff) | |
| download | libgphoto2-749968c3eb92a6043ccb1f5f49d39fc2823a57d8.tar.gz | |
travis-ci: Print the exact CC and CXX used
This prints a number of CC and CXX version messages, so we can see
better which C and C++ compilers are actually in use.
| -rw-r--r-- | .travis-script.sh | 18 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 24 insertions, 3 deletions
diff --git a/.travis-script.sh b/.travis-script.sh index e6ebe7514..a1d756a21 100644 --- a/.travis-script.sh +++ b/.travis-script.sh @@ -11,18 +11,32 @@ ls -l configure shift -set -e set -x abs_topsrcdir="$(pwd)" + rel_prefixdir="_root-${buildid}" abs_prefixdir="${abs_topsrcdir}/${rel_prefixdir}" + rel_builddir="_build-${buildid}" +cc --version +c++ --version +gcc --version +g++ --version +clang --version +clang++ --version + +echo "CC=\"${CC}\"" +echo "CXX=\"${CXX}\"" +test "x$CC" != "x" && "$CC" --version +test "x$CXX" != "x" && "$CXX" --version + +set -e + mkdir "${rel_builddir}" cd "${rel_builddir}" - if ../configure SLEEP=no --prefix="$abs_prefixdir" "$@" then echo "Configure successful." diff --git a/.travis.yml b/.travis.yml index 328194b20..12853ce16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ -language: c +language: + - c + - cpp os: - linux diff --git a/configure.ac b/configure.ac index 1e4c3ef47..68bbbb976 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,11 @@ dnl --------------------------------------------------------------------------- dnl Checks for programs. dnl --------------------------------------------------------------------------- +AC_MSG_CHECKING([original CC value]) +AC_MSG_RESULT(["$CC"]) +AC_MSG_CHECKING([original CXX value]) +AC_MSG_RESULT(["$CXX"]) + AC_PROG_CC AC_PROG_CPP AC_PROG_CXX |