diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-17 15:53:02 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-17 15:53:02 (GMT) |
| commit | ea282284d5d626b1143bea8d3be70995eaa88f2e (patch) | |
| tree | 8ac5f12977743e8caa4d2850fa5bff9d0ca3fe79 /Source/cmLocalGenerator.cxx | |
| parent | 8e8c9b72428ab3f4a63a99820dfd4aab46661bd6 (diff) | |
| download | CMake-ea282284d5d626b1143bea8d3be70995eaa88f2e.zip CMake-ea282284d5d626b1143bea8d3be70995eaa88f2e.tar.gz CMake-ea282284d5d626b1143bea8d3be70995eaa88f2e.tar.bz2 | |
Fix for bug #9466. Change the implementation of OSX arch lists. If no ARCHs are specified by the user then no flags are set. We no longer use CMAKE_OSX_ARCHITECTURES_DEFAULT.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 4d7bfdb..9338706 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1770,10 +1770,7 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags, bool addArchFlag = true; if(archs.size() == 1) { - const char* archOrig = - this->Makefile->GetSafeDefinition("CMAKE_OSX_ARCHITECTURES_DEFAULT"); - - if(archs[0] == archOrig) + if(archs[0] == "") { addArchFlag = false; } |