summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2013-10-21 15:56:35 +0000
committerMarshall Clow <mclow.lists@gmail.com>2013-10-21 15:56:35 +0000
commitef57b656f11b9a08c4f9b8d70f595a5465ddeff3 (patch)
tree6feece4838fff71c2d3995d47fdb3b7cde6504d3
parente604469e5c3b3bd0f39aa8202e215e5e3e3bfe70 (diff)
downloadbcm5719-llvm-ef57b656f11b9a08c4f9b8d70f595a5465ddeff3.tar.gz
bcm5719-llvm-ef57b656f11b9a08c4f9b8d70f595a5465ddeff3.zip
Patch by GM: Turn off 'deprecated' warnings when building with MSVC, and add '-Werror=return-type' to catch funtions that aren't returning what they should.
llvm-svn: 193088
-rw-r--r--libcxx/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 682757aa7e1..31274dc4b8f 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -196,7 +196,9 @@ endmacro()
# Get warning flags
if (NOT MSVC)
append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_WALL_FLAG -Wall)
+ set(LIBCXX_CXX_REQUIRED_FLAGS, -Werror=return-type)
endif()
+
append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_W_FLAG -W)
append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_WNO_UNUSED_PARAMETER_FLAG -Wno-unused-parameter)
append_if(LIBCXX_CXX_WARNING_FLAGS LIBCXX_HAS_WWRITE_STRINGS_FLAG -Wwrite-strings)
@@ -253,6 +255,10 @@ if (NOT LIBCXX_ENABLE_SHARED)
endif()
# This is the _ONLY_ place where add_definitions is called.
+if (MSVC)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
add_definitions(
${LIBCXX_CXX_REQUIRED_FLAGS}
${LIBCXX_CXX_WARNING_FLAGS}
OpenPOWER on IntegriCloud