diff options
author | Bob Wilson <bob.wilson@apple.com> | 2012-11-08 23:21:22 +0000 |
---|---|---|
committer | Bob Wilson <bob.wilson@apple.com> | 2012-11-08 23:21:22 +0000 |
commit | 458871a13c9f07bb46b4a32e3add0c9cb730f26e (patch) | |
tree | e34368168ee2eeae7007141ae957e014492e8ba3 | |
parent | c2fc67e0cf7dd061fda1aa90d81668f3e070d4cb (diff) | |
download | clang-458871a13c9f07bb46b4a32e3add0c9cb730f26e.tar.gz clang-458871a13c9f07bb46b4a32e3add0c9cb730f26e.tar.bz2 clang-458871a13c9f07bb46b4a32e3add0c9cb730f26e.tar.xz |
Remove more code related to invoking llvm-gcc. <rdar://problem/11991320>
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167598 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Driver/ToolChains.cpp | 24 | ||||
-rw-r--r-- | lib/Driver/ToolChains.h | 3 |
2 files changed, 0 insertions, 27 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 8a9381ec9c..49685c0880 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -232,30 +232,6 @@ DarwinClang::DarwinClang(const Driver &D, const llvm::Triple& Triple) getProgramPaths().push_back(getDriver().getInstalledDir()); if (getDriver().getInstalledDir() != getDriver().Dir) getProgramPaths().push_back(getDriver().Dir); - - // For fallback, we need to know how to find the GCC cc1 executables, so we - // also add the GCC libexec paths. This is legacy code that can be removed - // once fallback is no longer useful. - AddGCCLibexecPath(DarwinVersion[0]); - AddGCCLibexecPath(DarwinVersion[0] - 2); - AddGCCLibexecPath(DarwinVersion[0] - 1); - AddGCCLibexecPath(DarwinVersion[0] + 1); - AddGCCLibexecPath(DarwinVersion[0] + 2); -} - -void DarwinClang::AddGCCLibexecPath(unsigned darwinVersion) { - std::string ToolChainDir = "i686-apple-darwin"; - ToolChainDir += llvm::utostr(darwinVersion); - ToolChainDir += "/4.2.1"; - - std::string Path = getDriver().Dir; - Path += "/../llvm-gcc-4.2/libexec/gcc/"; - Path += ToolChainDir; - getProgramPaths().push_back(Path); - - Path = "/usr/llvm-gcc-4.2/libexec/gcc/"; - Path += ToolChainDir; - getProgramPaths().push_back(Path); } void DarwinClang::AddLinkARCArgs(const ArgList &Args, diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h index 9095433067..3c78365296 100644 --- a/lib/Driver/ToolChains.h +++ b/lib/Driver/ToolChains.h @@ -365,9 +365,6 @@ public: /// DarwinClang - The Darwin toolchain used by Clang. class LLVM_LIBRARY_VISIBILITY DarwinClang : public Darwin { -private: - void AddGCCLibexecPath(unsigned darwinVersion); - public: DarwinClang(const Driver &D, const llvm::Triple& Triple); |