diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-06 14:09:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-06 14:10:18 (GMT) |
| commit | f062f8b1fdc0284b9de7bebaa9300d209df3566a (patch) | |
| tree | 0d3c448271514cefe1064946c47f5f477b96703f | |
| parent | 084767a9ce22867156677c78763dd6917971f8f2 (diff) | |
| parent | 597209470809c23167c48e2dc85d6926a8faed16 (diff) | |
| download | CMake-f062f8b1fdc0284b9de7bebaa9300d209df3566a.zip CMake-f062f8b1fdc0284b9de7bebaa9300d209df3566a.tar.gz CMake-f062f8b1fdc0284b9de7bebaa9300d209df3566a.tar.bz2 | |
Merge topic 'objc-osx-architectures' into release-3.20
5972094708 ObjectiveC: Respect OSX_ARCHITECTURES for OBJC
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6090
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 73b6fbc..dcf590a 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1877,7 +1877,7 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags, std::vector<std::string> archs; target->GetAppleArchs(config, archs); if (!archs.empty() && - (lang == "C" || lang == "CXX" || lang == "OBJ" || lang == "OBJCXX" || + (lang == "C" || lang == "CXX" || lang == "OBJC" || lang == "OBJCXX" || lang == "ASM")) { for (std::string const& arch : archs) { if (filterArch.empty() || filterArch == arch) { |