maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

For i386 kext fallback to llvm-gcc, search paths for several Darwin versions. 

This replaces the hack to read UNAME_RELEASE from the environment when
identifying the OS version on Darwin, and it's more flexible.  It's also
horribly ugly, but at least this consolidates the ugliness to touch less of
the code so that it will be easier to rip out later.

llvm-svn: 140187
This commit is contained in:
Bob Wilson 2011-09-20 22:00:38 +00:00
parent 60aa85b672
commit 3e42bc55db
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/lib/Driver/ToolChains.cpp
View File

@ -276,8 +276,6 @@ Tool &Darwin::SelectTool(const Compilation &C, const JobAction &JA,
DarwinClang::DarwinClang(const HostInfo &Host, const llvm::Triple& Triple)
: Darwin(Host, Triple)
{
std::string UsrPrefix = "llvm-gcc-4.2/";
getProgramPaths().push_back(getDriver().getInstalledDir());
if (getDriver().getInstalledDir() != getDriver().Dir)
getProgramPaths().push_back(getDriver().Dir);
@ -290,16 +288,24 @@ DarwinClang::DarwinClang(const HostInfo &Host, const llvm::Triple& Triple)
// 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[0]);
ToolChainDir += llvm::utostr(darwinVersion);
ToolChainDir += "/4.2.1";
std::string Path = getDriver().Dir;
Path += "/../" + UsrPrefix + "libexec/gcc/";
Path += "/../llvm-gcc-4.2/libexec/gcc/";
Path += ToolChainDir;
getProgramPaths().push_back(Path);
Path = "/usr/" + UsrPrefix + "libexec/gcc/";
Path = "/usr/llvm-gcc-4.2/libexec/gcc/";
Path += ToolChainDir;
getProgramPaths().push_back(Path);
}

3
clang/lib/Driver/ToolChains.h
View File

@ -262,6 +262,9 @@ public:
/// DarwinClang - The Darwin toolchain used by Clang.
class LLVM_LIBRARY_VISIBILITY DarwinClang : public Darwin {
private:
void AddGCCLibexecPath(unsigned darwinVersion);
public:
DarwinClang(const HostInfo &Host, const llvm::Triple& Triple);