diff options
| -rw-r--r-- | lib/Driver/Tools.cpp | 12 | ||||
| -rw-r--r-- | lib/Frontend/InitHeaderSearch.cpp | 2 |
2 files changed, 0 insertions, 14 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 0142a28fe8..a3ce05f715 100644 --- a/lib/Driver/Tools.cpp +++ b/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"; diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index ef9129feaf..8925fdc5cf 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -386,8 +386,6 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp AddMinGWCPlusPlusIncludePaths("/usr/lib/gcc", "i686-pc-cygwin", "4.3.4"); // g++-4 / Cygwin-1.5 AddMinGWCPlusPlusIncludePaths("/usr/lib/gcc", "i686-pc-cygwin", "4.3.2"); - // FIXME: Do we support g++-3.4.4? - AddMinGWCPlusPlusIncludePaths("/usr/lib/gcc", "i686-pc-cygwin", "3.4.4"); break; case llvm::Triple::MinGW32: // mingw-w64 C++ include paths (i686-w64-mingw32 and x86_64-w64-mingw32) |