RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 02:52:53 +02:00
Code Issues Projects Releases Wiki Activity

[cmake] Add -fms-compatibility-version=19 when clang-cl gives errors about char16_t

Browse Source 
What we are really trying to do here is to figure out if we are using
the 2015 STL. Unfortunately, so far as I know the MSVC STL does not
define a version macro that we can check directly. Instead I wrote a
check to see if char16_t works.

llvm-svn: 264881
This commit is contained in:
Reid Kleckner 2016-03-30 17:30:26 +00:00
parent 33b2ba219f
commit 353c55531c
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/modules/HandleLLVMOptions.cmake
View File

@ -347,6 +347,17 @@ if( MSVC )
# "Enforce type conversion rules".
append("/Zc:rvalueCast" CMAKE_CXX_FLAGS)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# In VS 2015, char16_t became a builtin type. Clang still defaults to VS
# 2013 compatibility, where it cannot be a builtin type. If we're using an
# STL newer than 2015, this compilation will fail. Rasing the MSVC
# compatibility version of the compiler will provide char16/32.
check_cxx_source_compiles("#include <cstdint>\nchar16_t v1;\n" STL_PROVIDES_CHAR16_T)
if (NOT STL_PROVIDES_CHAR16_T)
append("-fms-compatibility-version=19" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
endif()
endif()
if (NOT LLVM_ENABLE_TIMESTAMPS AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# clang-cl and cl by default produce non-deterministic binaries because
# link.exe /incremental requires a timestamp in the .obj file. clang-cl