aboutsummaryrefslogtreecommitdiff
path: root/library
diff options
context:
space:
mode:
authorPaul Elliott <62069445+paul-elliott-arm@users.noreply.github.com>2024-03-29 13:59:36 +0000
committerGitHub <noreply@github.com>2024-03-29 13:59:36 +0000
commit30978ec6507c0a0376ae041fa333a2f24b0c09b8 (patch)
tree08f995832f23badfe61fb24466ee8dba7fe2c9d0 /library
parente14694071431070437a46dd6b80559c71eea671e (diff)
parent9f0858db3034c7319d4ddf36da0f1681c4b4fb2a (diff)
downloadmbedtls-30978ec6507c0a0376ae041fa333a2f24b0c09b8.zip
mbedtls-30978ec6507c0a0376ae041fa333a2f24b0c09b8.tar.gz
mbedtls-30978ec6507c0a0376ae041fa333a2f24b0c09b8.tar.bz2
Merge pull request #8874 from stevenwdv/development
Fix compilation on macOS without apple-clang
Diffstat (limited to 'library')
-rw-r--r--library/CMakeLists.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index e6705de..37a9724 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -220,11 +220,13 @@ if(WIN32)
set(libs ${libs} ws2_32 bcrypt)
endif(WIN32)
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- SET(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
- SET(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
- SET(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
- SET(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+if(CMAKE_C_COMPILER_ID MATCHES "AppleClang")
+ set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
+ set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
+endif()
+if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
+ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
+ set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>")
endif()
if(HAIKU)