yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build with cc from Apple LLVM

Browse source 
On Xcode 4.x and above (I tested Xcode 4.6.3 on 10.7.5 and Xcode 5.5.1 on 10.9.2), cmake (2.8.12.2, whether from MacPorts or from clang.org, FWIW) is detecting /usr/bin/cc as Clang, but CMAKE_COMPILER_IS_CLANG is not getting set, so the tests aren't being built. (There may have been other build problems as well, but the fact that the tests weren't being built was by far the most obvious problem.)

Checking the compiler ID detected by cmake, rather than the name of the command used to invoke the compiler, fixes this.
This commit is contained in:
Barry K. Nathan 2014-04-23 17:40:25 -07:00 committed by Paul Bakker
parent a26a005acf
commit cf975f5988
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project(POLARSSL C) project(POLARSSL C)
string(REGEX MATCH "clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER}") string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
if(CMAKE_COMPILER_IS_GNUCC) if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement")

2
ChangeLog
View file

@ -32,6 +32,8 @@ Bugfix
* Fix dependencies issues in X.509 test suite. * Fix dependencies issues in X.509 test suite.
* Some parts of ssl_tls.c were compiled even when the module was disabled. * Some parts of ssl_tls.c were compiled even when the module was disabled.
* Fix detection of DragonflyBSD in net.c (found by Markus Pfeiffer) * Fix detection of DragonflyBSD in net.c (found by Markus Pfeiffer)
* Fix detection of Clang on some Apple platforms with CMake
(found by Barry K. Nathan)
= PolarSSL 1.3.6 released on 2014-04-11 = PolarSSL 1.3.6 released on 2014-04-11