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

Revert r188531: "Windows ToolChain: add VS bin dir to PogramPaths" 

This never really worked. Even if we find and execute link.exe in the VS bin dir
this way, link.exe wouldn't find the DLLs it needs, libraries, etc.

It also causes trouble when the user has multiple versions of VS installed,
one of them is in the path, but this code finds the other one (PR17041).

Revert until we can fix this properly.

> Windows ToolChain: add VS bin dir to PogramPaths
>
> We have a lot of fancy logic to find Visual Studio, which is currently used
> to set the system header include paths.
>
> Use the same code to set the ProgramPaths, which is used for finding programs
> such as link.exe. Previously, Clang would just search PATH for link.exe,
> but now it should find it if it's able to find Visual Studio.

llvm-svn: 189661
This commit is contained in:
Hans Wennborg 2013-08-30 09:42:06 +00:00
parent 0ebf1bb150
commit 1cc6cce9a6
1 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
clang/lib/Driver/WindowsToolChain.cpp
View File

@ -33,6 +33,42 @@ using namespace clang::driver::toolchains;
using namespace clang;
using namespace llvm::opt;
Windows::Windows(const Driver &D, const llvm::Triple& Triple,
const ArgList &Args)
: ToolChain(D, Triple, Args) {
}
Tool *Windows::buildLinker() const {
return new tools::visualstudio::Link(*this);
}
Tool *Windows::buildAssembler() const {
if (getTriple().getEnvironment() == llvm::Triple::MachO)
return new tools::darwin::Assemble(*this);
getDriver().Diag(clang::diag::err_no_external_windows_assembler);
return NULL;
}
bool Windows::IsIntegratedAssemblerDefault() const {
return true;
}
bool Windows::IsUnwindTablesDefault() const {
return getArch() == llvm::Triple::x86_64;
}
bool Windows::isPICDefault() const {
return getArch() == llvm::Triple::x86_64;
}
bool Windows::isPIEDefault() const {
return false;
}
bool Windows::isPICDefaultForced() const {
return getArch() == llvm::Triple::x86_64;
}
// FIXME: This probably should goto to some platform utils place.
#ifdef _MSC_VER
@ -164,7 +200,7 @@ static bool getWindowsSDKDir(std::string &path) {
return false;
}
// Get Visual Studio installation directory.
// Get Visual Studio installation directory.
static bool getVisualStudioDir(std::string &path) {
// First check the environment variables that vsvars32.bat sets.
const char* vcinstalldir = getenv("VCINSTALLDIR");
@ -241,47 +277,6 @@ static bool getVisualStudioDir(std::string &path) {
#endif // _MSC_VER
Windows::Windows(const Driver &D, const llvm::Triple& Triple,
const ArgList &Args)
: ToolChain(D, Triple, Args) {
#ifdef _MSC_VER
std::string VSDir;
if (getVisualStudioDir(VSDir))
getProgramPaths().push_back(VSDir + "\\VC\\bin");
#endif
}
Tool *Windows::buildLinker() const {
return new tools::visualstudio::Link(*this);
}
Tool *Windows::buildAssembler() const {
if (getTriple().getEnvironment() == llvm::Triple::MachO)
return new tools::darwin::Assemble(*this);
getDriver().Diag(clang::diag::err_no_external_windows_assembler);
return NULL;
}
bool Windows::IsIntegratedAssemblerDefault() const {
return true;
}
bool Windows::IsUnwindTablesDefault() const {
return getArch() == llvm::Triple::x86_64;
}
bool Windows::isPICDefault() const {
return getArch() == llvm::Triple::x86_64;
}
bool Windows::isPIEDefault() const {
return false;
}
bool Windows::isPICDefaultForced() const {
return getArch() == llvm::Triple::x86_64;
}
void Windows::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
ArgStringList &CC1Args) const {
if (DriverArgs.hasArg(options::OPT_nostdinc))