From a0048af204e206aa5bcb80da91320a0f990fcb54 Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Tue, 5 Jan 2016 14:35:01 +0000
Subject: [PATCH] Reverting r256836; it causes a build bot failure:
http://lab.llvm.org:8011/builders/lldb-x86-win7-msvc/builds/14050/steps/build/logs/stdio
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@256837 91177308-0d34-0410-b5e6-96231b3b80d8
---
cmake/modules/HandleLLVMOptions.cmake | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
index f3a316f5782..4c5ffe2f7b2 100644
--- a/cmake/modules/HandleLLVMOptions.cmake
+++ b/cmake/modules/HandleLLVMOptions.cmake
@@ -363,17 +363,6 @@ if( MSVC )
append("/Zc:inline" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
- # Disable string literal const->non-const type conversion
- # "When specified, the compiler requires strict const-qualification
- # conformance for pointers initialized by using string literals."
- append("/Zc:strictStrings" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
-
- # Generate Intrinsic Functions
- append("/Oi" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
-
- # Enforce type conversion rules
- append("/Zc:rvalueCast" CMAKE_CXX_FLAGS)
-
# Disable sized deallocation if the flag is supported. MSVC fails to compile
# the operator new overload in User otherwise.
check_c_compiler_flag("/WX /Zc:sizedDealloc-" SUPPORTS_SIZED_DEALLOC)
--
2.34.1