summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-12-07 15:28:11 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-12-07 15:28:18 (GMT)
commit70c9a3e29482acbf1db35b548b7264daf4927213 (patch)
tree9e7951d7b46a20fd4217dc7534f045e112407999
parent1525385b20bdfbdb8f82d3f46ec1b8006605c91f (diff)
parentfcabf4a47e0c441ff80fad8f34e388b16738bd33 (diff)
downloadCMake-70c9a3e29482acbf1db35b548b7264daf4927213.zip
CMake-70c9a3e29482acbf1db35b548b7264daf4927213.tar.gz
CMake-70c9a3e29482acbf1db35b548b7264daf4927213.tar.bz2
Merge topic 'asm_arch' into release-3.19
fcabf4a47e macOS: Add architecture flags only for native ASM dialect Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5572
-rw-r--r--Source/cmLocalGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 65ddf95..61e7857 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1879,7 +1879,7 @@ void cmLocalGenerator::AddArchitectureFlags(std::string& flags,
target->GetAppleArchs(config, archs);
if (!archs.empty() &&
(lang == "C" || lang == "CXX" || lang == "OBJ" || lang == "OBJCXX" ||
- cmHasLiteralPrefix(lang, "ASM"))) {
+ lang == "ASM")) {
for (std::string const& arch : archs) {
if (filterArch.empty() || filterArch == arch) {
flags += " -arch ";