From 73ae28aa044bb34e4ac2d91c2cfa298907bb66a7 Mon Sep 17 00:00:00 2001 From: Dmitri Hrybenko Date: Tue, 24 Mar 2015 03:31:15 +0000 Subject: [PATCH] Revert garbage from a .cpp file Swift SVN r26478 --- tools/swift-ide-test/swift-ide-test.cpp | 46 +------------------------ 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/tools/swift-ide-test/swift-ide-test.cpp b/tools/swift-ide-test/swift-ide-test.cpp index 5bb6c305ab7..ef7e4b58c07 100644 --- a/tools/swift-ide-test/swift-ide-test.cpp +++ b/tools/swift-ide-test/swift-ide-test.cpp @@ -754,51 +754,7 @@ public: SourceRangesToDelete.push_back(VD->getSourceRange()); return false; } - }mate commit 3ff16dc84ff9b48d7673dbbc6c224c9c92640346 - Author: Jordan Rose - Date: Mon Mar 23 17:18:51 2015 - - [CMake] Reference LLVM components using COMPONENT_DEPENDS, not LINK_LIBRARIES. - - Fixes the Xcode build with LLVM RelWithDebInfo / Swift Debug. - - diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt - index 295f7d2..71fd59d 100644 - --- a/lib/AST/CMakeLists.txt - +++ b/lib/AST/CMakeLists.txt - @@ -40,7 +40,6 @@ add_swift_library(swiftAST - -# Clang dependencies. -# FIXME: Clang should really export these in some reasonable manner. - - LLVMDebugInfoDWARF - clangIndex - clangFormat - clangToolingCore - @@ -61,7 +60,7 @@ add_swift_library(swiftAST - clangBasic - - COMPONENT_DEPENDS - - bitreader bitwriter irreader - + bitreader bitwriter irreader debuginfoDWARF - profiledata instrumentation object objcarcopts mc mcparser - bitreader bitwriter ipo option core support ${LLVM_TARGETS_TO_BUILD} - ) - diff --git a/lib/ClangImporter/CMakeLists.txt b/lib/ClangImporter/CMakeLists.txt - index 228e3ee..524b2ea 100644 - --- a/lib/ClangImporter/CMakeLists.txt - +++ b/lib/ClangImporter/CMakeLists.txt - @@ -16,8 +16,8 @@ add_swift_library(swiftClangImporter - ImportType.cpp - LINK_LIBRARIES - swiftAST - - # Clang dependencies. - - LLVMDebugInfoDWARF - + COMPONENT_DEPENDS - + debuginfoDWARF - ) - - - + } if (auto *AFD = dyn_cast(D)) { SourceRangesToDelete.push_back(AFD->getBodySourceRange()); return false;