diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-10-12 14:58:59 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-10-12 14:58:59 (GMT) |
| commit | 79d9041d8156720d7639cb72ba8e6d98af9264d8 (patch) | |
| tree | ba799a01be7e5a9824b84dd6c79ff45c03966c02 /Source | |
| parent | 22fca8aa12bb8308cb930d45bff0449163dc70ac (diff) | |
| download | CMake-79d9041d8156720d7639cb72ba8e6d98af9264d8.zip CMake-79d9041d8156720d7639cb72ba8e6d98af9264d8.tar.gz CMake-79d9041d8156720d7639cb72ba8e6d98af9264d8.tar.bz2 | |
BUG: fix for bug 0003618 , allow one arch in OSX_ARCHS to work
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 7857072..3c20cf8 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1941,18 +1941,14 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags, std::vector<std::string> archs; cmSystemTools::ExpandListArgument(std::string(osxArch), archs); - if((archs.size() > 1) - || ((archs.size()== 1) && this->Makefile->IsOn("CMAKE_DO_TRY_COMPILE"))) + for( std::vector<std::string>::iterator i = archs.begin(); + i != archs.end(); ++i) { - for( std::vector<std::string>::iterator i = archs.begin(); - i != archs.end(); ++i) - { - flags += " -arch "; - flags += *i; - } - flags += " -isysroot "; - flags += sysroot; + flags += " -arch "; + flags += *i; } + flags += " -isysroot "; + flags += sysroot; } } this->AddConfigVariableFlags(flags, flagsVar.c_str(), config); |