From 44193b732eb4eeb670c75cdf28c4dd953e7a8ab7 Mon Sep 17 00:00:00 2001
From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Sat, 21 Jan 2012 14:46:01 +0000
Subject: [Cygwin] Abandon Cygwin-1.5 and g++-3. Use g++-4.3 and higher on
 Cygwin-1.7.

llvm-svn: 148636
---
 clang/lib/Driver/Tools.cpp | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'clang/lib/Driver/Tools.cpp')

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 0142a28fe80..a3ce05f715d 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -36,13 +36,6 @@
 #include "InputInfo.h"
 #include "ToolChains.h"
 
-#ifdef __CYGWIN__
-#include <cygwin/version.h>
-#if defined(CYGWIN_VERSION_DLL_MAJOR) && CYGWIN_VERSION_DLL_MAJOR<1007
-#define IS_CYGWIN15 1
-#endif
-#endif
-
 using namespace clang::driver;
 using namespace clang::driver::tools;
 using namespace clang;
@@ -2748,12 +2741,7 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
   if (!customGCCName.empty())
     GCCName = customGCCName.c_str();
   else if (D.CCCIsCXX) {
-#ifdef IS_CYGWIN15
-    // FIXME: Detect the version of Cygwin at runtime?
-    GCCName = "g++-4";
-#else
     GCCName = "g++";
-#endif
   } else
     GCCName = "gcc";
 
-- 
cgit v1.2.3