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

Have FreeBSD use even more of the same smarts as Linux is now using for 

adding search paths. Add them only when they exist, and prefix the paths
with the sysroot. This will allow targeting a FreeBSD sysroot on
a non-FreeBSD host machine, and perhaps more importantly should allow
testing the FreeBSD driver's behavior similarly to the Linux tests with
a fake tree of files in the regression test suite.

I don't have FreeBSD systems handy to build up the list of files that
should be used here, but this is the basic functionality and I'm hoping
Roman or someone from the community can contribute the actual test
cases.

llvm-svn: 148940
This commit is contained in:
Chandler Carruth 2012-01-25 08:10:33 +00:00
parent f4826e28b9
commit 25442b8e72
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1623,6 +1623,10 @@ Tool &OpenBSD::SelectTool(const Compilation &C, const JobAction &JA,
return *T; return *T;
} }
static void addPathIfExists(Twine Path, ToolChain::path_list &Paths) {
if (llvm::sys::fs::exists(Path)) Paths.push_back(Path.str());
}
/// FreeBSD - FreeBSD tool chain which can call as(1) and ld(1) directly. /// FreeBSD - FreeBSD tool chain which can call as(1) and ld(1) directly.
FreeBSD::FreeBSD(const HostInfo &Host, const llvm::Triple& Triple) FreeBSD::FreeBSD(const HostInfo &Host, const llvm::Triple& Triple)
@ -1633,9 +1637,9 @@ FreeBSD::FreeBSD(const HostInfo &Host, const llvm::Triple& Triple)
// for the remaining cases. // for the remaining cases.
if (Triple.getArch() == llvm::Triple::x86 || if (Triple.getArch() == llvm::Triple::x86 ||
Triple.getArch() == llvm::Triple::ppc) Triple.getArch() == llvm::Triple::ppc)
getFilePaths().push_back("/usr/lib32"); addPathIfExists(getDriver().SysRoot + "/usr/lib32", getFilePaths());
getFilePaths().push_back("/usr/lib"); addPathIfExists(getDriver().SysRoot + "/usr/lib", getFilePaths());
} }
Tool &FreeBSD::SelectTool(const Compilation &C, const JobAction &JA, Tool &FreeBSD::SelectTool(const Compilation &C, const JobAction &JA,
@ -1929,10 +1933,6 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) {
return UnknownDistro; return UnknownDistro;
} }
static void addPathIfExists(Twine Path, ToolChain::path_list &Paths) {
if (llvm::sys::fs::exists(Path)) Paths.push_back(Path.str());
}
/// \brief Get our best guess at the multiarch triple for a target. /// \brief Get our best guess at the multiarch triple for a target.
/// ///
/// Debian-based systems are starting to use a multiarch setup where they use /// Debian-based systems are starting to use a multiarch setup where they use