[cmake-commits] hoffman committed cmLocalGenerator.cxx 1.236 1.237

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv6536

Modified Files:
	cmLocalGenerator.cxx 
Log Message:
BUG: fix for bug 0003618 , allow one arch in OSX_ARCHS to work


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- cmLocalGenerator.cxx	28 Aug 2007 20:19:01 -0000	1.236
+++ cmLocalGenerator.cxx	12 Oct 2007 14:58:59 -0000	1.237
@@ -1941,18 +1941,14 @@
       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);