浏览代码

macOS: Respect OSX_ARCHITECTURES for ASM

Fixes #20771.
Raul Tambre 5 年之前
父节点
当前提交
940fc62962
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. 5 0
      Help/release/dev/asm-osx-architectures.rst
  2. 3 2
      Source/cmLocalGenerator.cxx

+ 5 - 0
Help/release/dev/asm-osx-architectures.rst

@@ -0,0 +1,5 @@
+asm-osx-architectures
+---------------------
+
+* The :prop_tgt:`OSX_ARCHITECTURES` target property is now respected for the
+  ``ASM`` language.

+ 3 - 2
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 ";