[gjs: 2/4] CI: no need to pick the default compiler

[Philip Chimento <pchimento src gnome org>]

commit c79a86e3560ce8ea77df6354c26aba9fb1573348
Author: Claudio André <claudioandre br gmail com>
Date:   Sat Jun 9 10:08:57 2018 -0300

    CI: no need to pick the default compiler

 .gitlab-ci.yml               | 12 ------------
 test/extra/do_environment.sh | 15 +++++++++------
 2 files changed, 9 insertions(+), 18 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c968155c..e415b19e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,6 @@ fedora:
   stage: source_check
   image: claudioandre/spidermonkey:job-456.7  # pinned on purpose
   variables:
-    CC: gcc
     TEST: "check"
     WARNINGS: "count"
 
@@ -91,7 +90,6 @@ ubuntu_gcc:
   stage: test
   image: claudioandre/spidermonkey:ubuntu.dev.gcc
   variables:
-    CC: gcc
     TEST: "distcheck"
   only:
     - master@GNOME/gjs
@@ -119,7 +117,6 @@ no_profiler:
   stage: thorough_tests
   image: claudioandre/spidermonkey:fedora.dev.gcc
   variables:
-    CC: gcc
     TEST: "check"
     BUILD_OPTS: "--disable-profiler"
 
@@ -136,7 +133,6 @@ coverage:
   stage: thorough_tests
   image: claudioandre/spidermonkey:fedora.27.gcc
   variables:
-    CC: gcc
     DEV: jhbuild
     BUILD_OPTS: "--enable-code-coverage"
     coverage: '/^Lines:.\d+.\d+.(\d+\.\d+\%)/'
@@ -148,7 +144,6 @@ sanitizer_gcc:
   stage: thorough_tests
   image: claudioandre/spidermonkey:fedora.dev.gcc
   variables:
-    CC: gcc
     TEST: "check"
     BUILD_OPTS: "--enable-asan --enable-ubsan"
 
@@ -160,7 +155,6 @@ with_logging:
   stage: thorough_tests
   image: claudioandre/spidermonkey:fedora.dev.gcc
   variables:
-    CC: gcc
     BUILD_OPTS: CPPFLAGS='-DGJS_VERBOSE_ENABLE_PROPS=1 -DGJS_VERBOSE_ENABLE_MARSHAL=1 
-DGJS_VERBOSE_ENABLE_LIFECYCLE=1 -DGJS_VERBOSE_ENABLE_GI_USAGE=1 -DGJS_VERBOSE_ENABLE_CLOSURE=1 
-DGJS_VERBOSE_ENABLE_GSIGNAL=1'
 
 sanitizer_clang:
@@ -245,7 +239,6 @@ valgrind:
   stage: thorough_tests
   image: claudioandre/spidermonkey:fedora.dev.gcc
   variables:
-    CC: gcc
     BUILD_OPTS: "--enable-valgrind --disable-valgrind-helgrind --prefix=/usr"
   allow_failure: true
   when: manual
@@ -255,7 +248,6 @@ no_graphics:
   stage: thorough_tests
   image: claudioandre/spidermonkey:fedora.dev.gcc
   variables:
-    CC: gcc
     TEST: "check"
     BUILD_OPTS: "--without-cairo --without-gtk"
   when: manual
@@ -265,7 +257,6 @@ lts:
   stage: thorough_tests
   image: claudioandre/spidermonkey:ubuntu.lts.gcc
   variables:
-    CC: gcc
     DEV: jhbuild
     TEST: "check"
   when: manual
@@ -297,7 +288,6 @@ zeal_2:
   stage: thorough_tests
   image: claudioandre/spidermonkey:fedora.debug.gcc
   variables:
-    CC: gcc
     TEST: "check"
     JS_GC_ZEAL: 2
   when: manual
@@ -307,7 +297,6 @@ zeal_4:
   stage: thorough_tests
   image: claudioandre/spidermonkey:fedora.debug.gcc
   variables:
-    CC: gcc
     TEST: "check"
     JS_GC_ZEAL: 4
   when: manual
@@ -317,7 +306,6 @@ zeal_11:
   stage: thorough_tests
   image: claudioandre/spidermonkey:fedora.debug.gcc
   variables:
-    CC: gcc
     TEST: "check"
     JS_GC_ZEAL: 11
   when: manual
diff --git a/test/extra/do_environment.sh b/test/extra/do_environment.sh
index 8ca598bc..51a5cd27 100755
--- a/test/extra/do_environment.sh
+++ b/test/extra/do_environment.sh
@@ -76,8 +76,10 @@ function do_Build_JHBuild(){
 
 function do_Show_Info(){
 
+    local compiler=gcc
+
     echo '-----------------------------------------'
-    echo 'Useful build system information'
+    echo 'Build system information'
     echo -n "Processors: "; grep -c ^processor /proc/cpuinfo
     grep ^MemTotal /proc/meminfo
     id; uname -a
@@ -87,10 +89,11 @@ function do_Show_Info(){
     echo '-----------------------------------------'
 
     if [[ ! -z $CC ]]; then
-        echo 'Compiler version'
-        $CC --version
-        echo '-----------------------------------------'
-        $CC -dM -E -x c /dev/null
-        echo '-----------------------------------------'
+        compiler=$CC
     fi
+    echo 'Compiler version'
+    $compiler --version
+    echo '-----------------------------------------'
+    $compiler -dM -E -x c /dev/null
+    echo '-----------------------------------------'
 }