diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | lib/Analysis/CFG.cpp | 4 | ||||
| -rw-r--r-- | lib/Driver/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | lib/Frontend/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tools/libclang/CMakeLists.txt | 7 |
5 files changed, 2 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c828482ac7..ebf5e418e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,14 +198,6 @@ macro(add_clang_library name) link_system_libs( ${name} ) add_dependencies(${name} ClangDiagnosticCommon) - if(MSVC) - get_target_property(cflag ${name} COMPILE_FLAGS) - if(NOT cflag) - set(cflag "") - endif(NOT cflag) - set(cflag "${cflag} /Za") - set_target_properties(${name} PROPERTIES COMPILE_FLAGS ${cflag}) - endif(MSVC) install(TARGETS ${name} LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp index 9a50578c4f..44a0eec21d 100644 --- a/lib/Analysis/CFG.cpp +++ b/lib/Analysis/CFG.cpp @@ -3200,8 +3200,8 @@ CFGImplicitDtor::getDestructorDecl(ASTContext &astContext) const { } bool CFGImplicitDtor::isNoReturn(ASTContext &astContext) const { - if (const CXXDestructorDecl *cdecl = getDestructorDecl(astContext)) { - QualType ty = cdecl->getType(); + if (const CXXDestructorDecl *decl = getDestructorDecl(astContext)) { + QualType ty = decl->getType(); return cast<FunctionType>(ty)->getNoReturnAttr(); } return false; diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt index c7850656e3..a16b2ce69f 100644 --- a/lib/Driver/CMakeLists.txt +++ b/lib/Driver/CMakeLists.txt @@ -20,13 +20,6 @@ add_clang_library(clangDriver Types.cpp ) -IF(MSVC) - get_target_property(NON_ANSI_COMPILE_FLAGS clangDriver COMPILE_FLAGS) - string(REPLACE /Za - "" NON_ANSI_COMPILE_FLAGS - ${NON_ANSI_COMPILE_FLAGS}) - set_target_properties(clangDriver PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS}) -ENDIF(MSVC) add_dependencies(clangDriver ClangAttrList ClangDiagnosticDriver ClangDriverOptions ClangCC1AsOptions) diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt index a2b5c1e28e..6f61290c05 100644 --- a/lib/Frontend/CMakeLists.txt +++ b/lib/Frontend/CMakeLists.txt @@ -41,13 +41,6 @@ add_clang_library(clangFrontend Warnings.cpp ) -IF(MSVC) - get_target_property(NON_ANSI_COMPILE_FLAGS clangFrontend COMPILE_FLAGS) - string(REPLACE /Za - "" NON_ANSI_COMPILE_FLAGS - ${NON_ANSI_COMPILE_FLAGS}) - set_target_properties(clangFrontend PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS}) -ENDIF(MSVC) add_dependencies(clangFrontend ClangAttrClasses diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt index 373bfb35b9..293dfa3ff9 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt @@ -76,13 +76,6 @@ if( LLVM_ENABLE_PIC ) INSTALL_NAME_DIR "@executable_path/../lib") endif() - if(MSVC) - # windows.h doesn't compile with /Za - get_target_property(NON_ANSI_COMPILE_FLAGS libclang COMPILE_FLAGS) - string(REPLACE "/Za" "" NON_ANSI_COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS}) - set_target_properties(libclang PROPERTIES - COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS}) - endif() set(LIBCLANG_STATIC_TARGET_NAME libclang_static) else() |