kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix for bug 0003618 , allow one arch in OSX_ARCHS to work

Browse Source
This commit is contained in:
Bill Hoffman 2007-10-12 10:58:59 -04:00
parent 22fca8aa12
commit 79d9041d81
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmLocalGenerator.cxx
View File

@ -1941,9 +1941,6 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
std::vector<std::string> archs; std::vector<std::string> archs;
cmSystemTools::ExpandListArgument(std::string(osxArch), cmSystemTools::ExpandListArgument(std::string(osxArch),
archs); archs);
if((archs.size() > 1)
|| ((archs.size()== 1) && this->Makefile->IsOn("CMAKE_DO_TRY_COMPILE")))
{
for( std::vector<std::string>::iterator i = archs.begin(); for( std::vector<std::string>::iterator i = archs.begin();
i != archs.end(); ++i) i != archs.end(); ++i)
{ {
@ -1954,7 +1951,6 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
flags += sysroot; flags += sysroot;
} }
} }
}
this->AddConfigVariableFlags(flags, flagsVar.c_str(), config); this->AddConfigVariableFlags(flags, flagsVar.c_str(), config);
} }