diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-25 14:40:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-25 14:40:20 (GMT) |
| commit | 5e212cafba0f2266510841eea3f5c7b79fde9449 (patch) | |
| tree | dad2a99aec8cf9aa76a060562636d38b97cb79c4 /Source/cmLocalGenerator.cxx | |
| parent | f035ddec4feadfe4ed14a7fd0858f1e49e4c1979 (diff) | |
| parent | 940fc629628f505e57c0d3a7a524a8447ee6f49b (diff) | |
| download | CMake-5e212cafba0f2266510841eea3f5c7b79fde9449.zip CMake-5e212cafba0f2266510841eea3f5c7b79fde9449.tar.gz CMake-5e212cafba0f2266510841eea3f5c7b79fde9449.tar.bz2 | |
Merge topic 'osx_asm_architectures'
940fc62962 macOS: Respect OSX_ARCHITECTURES for ASM
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5152
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 3cbc8ac..40010fc 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1875,8 +1875,9 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags, if (this->Makefile->IsOn("APPLE") && this->EmitUniversalBinaryFlags) { std::vector<std::string> archs; target->GetAppleArchs(config, archs); - if (!archs.empty() && !lang.empty() && - (lang[0] == 'C' || lang[0] == 'F' || lang[0] == 'O')) { + if (!archs.empty() && + (lang == "C" || lang == "CXX" || lang == "OBJ" || lang == "OBJCXX" || + cmHasLiteralPrefix(lang, "ASM"))) { for (std::string const& arch : archs) { if (filterArch.empty() || filterArch == arch) { flags += " -arch "; |