[compiler-rt] r218464 - Fix a mistake in r217762
Ehsan Akhgari
ehsan.akhgari at gmail.com
Thu Sep 25 13:42:49 PDT 2014
Author: ehsan
Date: Thu Sep 25 15:42:49 2014
New Revision: 218464
URL: http://llvm.org/viewvc/llvm-project?rev=218464&view=rev
Log:
Fix a mistake in r217762
Summary:
The extra macro definition needs to go into COMPILER_RT_GTEST_CFLAGS
in order to be used for gtests on MSVC2012.
Test Plan: This is part of the fixes necessary for the ASAN tests to pass with MSVC2012.
Reviewers: timurrrr
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D5493
Modified:
compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake
Modified: compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake?rev=218464&r1=218463&r2=218464&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake Thu Sep 25 15:42:49 2014
@@ -142,7 +142,7 @@ if(MSVC)
# Visual Studio 2012 only supports up to 8 template parameters in
# std::tr1::tuple by default, but gtest requires 10
if(MSVC_VERSION EQUAL 1700)
- add_definitions(-D_VARIADIC_MAX=10)
+ list(APPEND COMPILER_RT_GTEST_CFLAGS -D_VARIADIC_MAX=10)
endif()
endif()
More information about the llvm-commits
mailing list