build: show llvm/clang in platform flags and `buildinfo.txt`

Show these flags:
- `LLVM-CLANG` for mainline llvm/clang.
- `APPLE-CLANG` for Apple clang.
- `CLANG-CL` for clang-cl. (cmake only)

Also:
- GHA/linux: fix a job to build with clang, to match its descriptions.

Closes #18645

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index af2edf0e092bd03585ba00e14b0c479d05ca8e71..c9f090a969e3df7782c9f8b1503c9b5b2c9919fb 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -179,6 +179,7 @@ jobs:
           - name: 'openssl clang krb5 LTO'
             install_packages: zlib1g-dev libkrb5-dev clang
             install_steps: skiprun
+            CC: clang
             generate: -DCURL_USE_OPENSSL=ON -DCURL_USE_GSSAPI=ON -DENABLE_DEBUG=ON -DCURL_LTO=ON
 
           - name: 'openssl !ipv6 !--libcurl !--digest-auth'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad78c58ed1db6dd72a533269e5271aae1ed4360c..a0587327db5f02dd827f910e350c77e66b83a7b7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,6 +148,15 @@ endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
   string(APPEND _target_flags " GCC")
 endif()
+if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+  if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+    string(APPEND _target_flags " APPLE-CLANG")
+  elseif(MSVC)
+    string(APPEND _target_flags " CLANG-CL")
+  else()
+    string(APPEND _target_flags " LLVM-CLANG")
+  endif()
+endif()
 if(MINGW)
   string(APPEND _target_flags " MINGW")
 endif()

diff --git a/acinclude.m4 b/acinclude.m4
index fe10c2ec9715fd26ceac6462bc6dee4517e4c688..f6a7852779690952300a36a9fe465135722787ea 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1492,6 +1492,11 @@ AC_DEFUN([CURL_PREPARE_BUILDINFO], [
   if test "x$compiler_id" = 'xGNU_C'; then
     curl_pflags="${curl_pflags} GCC"
   fi
+  if "$compiler_id" = "APPLECLANG"; then
+    curl_pflags="${curl_pflags} APPLE-CLANG"
+  elif test "$compiler_id" = "CLANG"; then
+    curl_pflags="${curl_pflags} LLVM-CLANG"
+  fi
   case $host_os in
     mingw*) curl_pflags="${curl_pflags} MINGW";;
   esac