Browse Source

cmLocalGenerator: Consolidate conditions in AddArchitectureFlags

Make room for possible future non-Apple architecture flags.
Brad King 9 years ago
parent
commit
0c7951a939
1 changed files with 1 additions and 5 deletions
  1. 1 5
      Source/cmLocalGenerator.cxx

+ 1 - 5
Source/cmLocalGenerator.cxx

@@ -1475,11 +1475,7 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags,
                                             const std::string& config)
 {
   // Only add Mac OS X specific flags on Darwin platforms (OSX and iphone):
-  if (!this->Makefile->IsOn("APPLE")) {
-    return;
-  }
-
-  if (this->EmitUniversalBinaryFlags) {
+  if (this->Makefile->IsOn("APPLE") && this->EmitUniversalBinaryFlags) {
     std::vector<std::string> archs;
     target->GetAppleArchs(config, archs);
     const char* sysroot = this->Makefile->GetDefinition("CMAKE_OSX_SYSROOT");