From 6825600d69f31b96d28d50124dc4c19d39771179 Mon Sep 17 00:00:00 2001 From: "Timmer, Daan" Date: Tue, 11 Feb 2025 09:37:28 +0000 Subject: [PATCH 1/2] Replaced CMAKE_C_SIMULATE_ID with CMAKE_C_COMPILER_FRONTEND_VARIANT Signed-off-by: Timmer, Daan --- CMakeLists.txt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f23c3b2f7..09fb08ed6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,16 +77,10 @@ endif() option(DISABLE_PACKAGE_CONFIG_AND_INSTALL "Disable package configuration, target export and installation" ${MBEDTLS_AS_SUBPROJECT}) -if (CMAKE_C_SIMULATE_ID) - set(COMPILER_ID ${CMAKE_C_SIMULATE_ID}) -else() - set(COMPILER_ID ${CMAKE_C_COMPILER_ID}) -endif(CMAKE_C_SIMULATE_ID) - -string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${COMPILER_ID}") -string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${COMPILER_ID}") -string(REGEX MATCH "IAR" CMAKE_COMPILER_IS_IAR "${COMPILER_ID}") -string(REGEX MATCH "MSVC" CMAKE_COMPILER_IS_MSVC "${COMPILER_ID}") +string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_FRONTEND_VARIANT}") +string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${CMAKE_C_COMPILER_FRONTEND_VARIANT}") +string(REGEX MATCH "IAR" CMAKE_COMPILER_IS_IAR "${CMAKE_C_COMPILER_FRONTEND_VARIANT}") +string(REGEX MATCH "MSVC" CMAKE_COMPILER_IS_MSVC "${CMAKE_C_COMPILER_FRONTEND_VARIANT}") # the test suites currently have compile errors with MSVC if(CMAKE_COMPILER_IS_MSVC) From 636a81a1f744dbcea951351c63c071d0d8bb2575 Mon Sep 17 00:00:00 2001 From: "Timmer, Daan" Date: Wed, 12 Feb 2025 14:17:04 +0000 Subject: [PATCH 2/2] Dont set the compiler to GNU when the compiler is Clang Signed-off-by: Timmer, Daan --- CMakeLists.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09fb08ed6f..ecfba11754 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,10 +77,20 @@ endif() option(DISABLE_PACKAGE_CONFIG_AND_INSTALL "Disable package configuration, target export and installation" ${MBEDTLS_AS_SUBPROJECT}) -string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_FRONTEND_VARIANT}") -string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${CMAKE_C_COMPILER_FRONTEND_VARIANT}") -string(REGEX MATCH "IAR" CMAKE_COMPILER_IS_IAR "${CMAKE_C_COMPILER_FRONTEND_VARIANT}") -string(REGEX MATCH "MSVC" CMAKE_COMPILER_IS_MSVC "${CMAKE_C_COMPILER_FRONTEND_VARIANT}") +if (CMAKE_C_COMPILER_ID MATCHES "Clang") + if (CMAKE_C_COMPILER_FRONTEND_VARIANT MATCHES "GNU") + set(COMPILER_ID "Clang") + else() + set(COMPILER_ID ${CMAKE_C_COMPILER_FRONTEND_VARIANT}) + endif() +else() + set(COMPILER_ID ${CMAKE_C_COMPILER_ID}) +endif() + +string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${COMPILER_ID}") +string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${COMPILER_ID}") +string(REGEX MATCH "IAR" CMAKE_COMPILER_IS_IAR "${COMPILER_ID}") +string(REGEX MATCH "MSVC" CMAKE_COMPILER_IS_MSVC "${COMPILER_ID}") # the test suites currently have compile errors with MSVC if(CMAKE_COMPILER_IS_MSVC)