From 7108b3f04878208d4f413402b9c265021cf72070 Mon Sep 17 00:00:00 2001 From: "Denis S. Soldatov aka General-Beck" Date: Wed, 5 Feb 2020 15:30:49 +0300 Subject: [PATCH] gcc to clang (#11453) * gcc to clang test ``` export CC="sccache "$CC export CXX="sccache "$CXX ``` darwin build ``` CC=clang CXX=clang ``` * darwin - > default clang --- .gitlab-ci.yml | 2 -- scripts/gitlab/test-linux.sh | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06862bcea..67eb80cf4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,8 +165,6 @@ build-darwin: variables: CARGO_TARGET: x86_64-apple-darwin CARGO_HOME: "${CI_PROJECT_DIR}/.cargo" - CC: gcc - CXX: g++ script: - scripts/gitlab/build-linux.sh tags: diff --git a/scripts/gitlab/test-linux.sh b/scripts/gitlab/test-linux.sh index 33e8f311a..808c74183 100755 --- a/scripts/gitlab/test-linux.sh +++ b/scripts/gitlab/test-linux.sh @@ -5,8 +5,8 @@ echo "________Running test-linux.sh________" set -e # fail on any error set -u # treat unset variables as error -export CC="sccache gcc" -export CXX="sccache g++" +export CC="sccache "$CC +export CXX="sccache "$CXX FEATURES="json-tests" OPTIONS="--release"