Fix to long-standing compiler detection issue with Conan/CMake

conan-io/conan#4322 (comment)
johnmcfarlane · Mar 11, 2023 · 6a7120f · 6a7120f
1 parent 6a357b0
commit 6a7120f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/workflows/conan/clang-static-analyzer b/workflows/conan/clang-static-analyzer
@@ -4,6 +4,7 @@ set -euo pipefail
 
 PROJECT_DIR=$(cd "$(dirname "$0")"/../..; pwd)
 NUM_CPUS=$(nproc)
+export CC=clang
 export CXX=clang++
 
 "$PROJECT_DIR"/workflows/conan/install clang-static-analyzer

diff --git a/workflows/conan/libfuzzer b/workflows/conan/libfuzzer
@@ -3,6 +3,7 @@
 set -euo pipefail
 
 PROJECT_DIR=$(cd "$(dirname "$0")"/../..; pwd)
+export CC=clang
 export CXX=clang++
 
 "$PROJECT_DIR"/workflows/conan/install libfuzzer

diff --git a/workflows/conan/release-clang b/workflows/conan/release-clang
@@ -3,6 +3,7 @@
 set -euo pipefail
 
 PROJECT_DIR=$(cd "$(dirname "$0")"/../..; pwd)
+export CC=clang
 export CXX=clang++
 
 "$PROJECT_DIR"/workflows/conan/install release-clang

diff --git a/workflows/conan/release-gcc b/workflows/conan/release-gcc
@@ -3,6 +3,7 @@
 set -euo pipefail
 
 PROJECT_DIR=$(cd "$(dirname "$0")"/../..; pwd)
+export CC=gcc
 export CXX=g++
 
 "$PROJECT_DIR"/workflows/conan/install release-gcc

diff --git a/workflows/conan/test-clang b/workflows/conan/test-clang
@@ -3,6 +3,7 @@
 set -euo pipefail
 
 PROJECT_DIR=$(cd "$(dirname "$0")"/../..; pwd)
+export CC=clang
 export CXX=clang++
 
 "$PROJECT_DIR"/workflows/conan/install test-clang

diff --git a/workflows/conan/test-gcc b/workflows/conan/test-gcc
@@ -3,6 +3,7 @@
 set -euo pipefail
 
 PROJECT_DIR=$(cd "$(dirname "$0")"/../..; pwd)
+export CC=gcc
 export CXX=g++
 
 "$PROJECT_DIR"/workflows/conan/install test-gcc