jjb: Derive lttng-modules architecture from platform label

[lttng-ci.git] / scripts / common / print.sh

diff --git a/scripts/common/print.sh b/scripts/common/print.sh
index 21c5e609219a72253337a918ef57305af0f322de..e13ddd0e43ae667418980d53df2c880b9aa372d3 100755 (executable)
--- a/scripts/common/print.sh
+++ b/scripts/common/print.sh
@@ -1,19 +1,7 @@
 #!/bin/bash
 #
-# Copyright (C) 2020 Michael Jeanson <mjeanson@efficios.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-FileCopyrightText: 2020 Michael Jeanson <mjeanson@efficios.com>
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 set -exu
 
@@ -58,15 +46,27 @@ print_tooling() {
     print_blue "Selected CC version"
     ${CC:-cc} --version | head -n1
 
+    print_blue "Selected CXX version"
+    ${CXX:-c++} --version | head -n1
+
     print_blue "Default gcc version"
     gcc --version | head -n1
     gcc -dumpmachine
 
+    print_blue "Default g++ version"
+    g++ --version | head -n1
+    g++ -dumpmachine
+
     if command -v clang >/dev/null 2>&1; then
         print_blue "Default clang version"
         clang --version
     fi
 
+    if command -v clang++ >/dev/null 2>&1; then
+        print_blue "Default clang++ version"
+        clang++ --version
+    fi
+
     print_blue "git version"
     git --version
 
@@ -108,7 +108,7 @@ print_tooling() {
     ${TAR:-tar} --version | head -n1
 
     print_blue "Selected python version"
-    ${PYTHON} --version
+    ${PYTHON:-python} --version
 
     if command -v "${PYTHON2:-python2}" >/dev/null 2>&1; then
         print_blue "python2 version"