ENH: use last mount point found for mingw location, not first
This commit is contained in:
parent
b6863e9fad
commit
74d315077c
|
@ -33,17 +33,18 @@ cmGlobalMSYSMakefileGenerator::FindMinGW(std::string const& makeloc)
|
||||||
std::ifstream fin(fstab.c_str());
|
std::ifstream fin(fstab.c_str());
|
||||||
std::string path;
|
std::string path;
|
||||||
std::string mount;
|
std::string mount;
|
||||||
|
std::string mingwBin;
|
||||||
while(fin)
|
while(fin)
|
||||||
{
|
{
|
||||||
fin >> path;
|
fin >> path;
|
||||||
fin >> mount;
|
fin >> mount;
|
||||||
if(mount == "/mingw")
|
if(mount == "/mingw")
|
||||||
{
|
{
|
||||||
path += "/bin";
|
mingwBin = path;
|
||||||
return path;
|
mingwBin += "/bin";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return "";
|
return mingwBin;
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmGlobalMSYSMakefileGenerator::EnableLanguage(std::vector<std::string>const& l,
|
void cmGlobalMSYSMakefileGenerator::EnableLanguage(std::vector<std::string>const& l,
|
||||||
|
|
Loading…
Reference in New Issue