Merge pull request #78909 from xtremekforever/#75341-fix-swift-build-support-typo

Fix typo in get_linux_sysroot that makes cross-compilation fail

Author: MaxDesiatov

utils/swift_build_support/swift_build_support/products/product.py

@@ -379,7 +379,7 @@ def get_linux_target_components(self, arch):
     def get_linux_sysroot(self, platform, arch):
         if not self.is_cross_compile_target('{}-{}'.format(platform, arch)):
             return None
-        sysroot_arch, abi = self.get_linux_target_components(arch)
+        sysroot_arch, _, abi = self.get_linux_target_components(arch)
         # $ARCH-$PLATFORM-$ABI
         # E.x.: aarch64-linux-gnu
         sysroot_dirname = '{}-{}-{}'.format(sysroot_arch, platform, abi)

utils/swift_build_support/tests/products/test_llvm_linux_cross_compile.py

@@ -0,0 +1,69 @@
+# tests/products/test_llvm_linux_cross_compile.py ---------------*- python -*-
+#
+# This source file is part of the LLVM.org open source project
+#
+# Copyright (c) 2014 - 2025 Apple Inc. and the LLVM project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See https://swift.org/LICENSE.txt for license information
+# See https://swift.org/CONTRIBUTORS.txt for the list of LLVM project authors
+# ----------------------------------------------------------------------------
+
+import argparse
+import os
+import sys
+import tempfile
+import unittest
+from io import StringIO
+
+from swift_build_support import shell
+from swift_build_support.products import LLVM
+from swift_build_support.toolchain import host_toolchain
+
+
+class LLVMLinuxCrossCompileTestCase(unittest.TestCase):
+    def setUp(self):
+        # Setup workspace
+        tmpdir1 = os.path.realpath(tempfile.mkdtemp())
+        os.makedirs(os.path.join(tmpdir1, 'llvm'))
+
+        # Setup toolchain
+        self.toolchain = host_toolchain()
+        self.toolchain.cc = '/path/to/cc'
+        self.toolchain.cxx = '/path/to/cxx'
+
+        # Setup args
+        self.args = argparse.Namespace(
+            llvm_targets_to_build='X86;ARM;AArch64',
+            llvm_assertions='true',
+            compiler_vendor='none',
+            clang_compiler_version=None,
+            clang_user_visible_version=None,
+            cross_compile_hosts='linux-aarch64',
+            cross_compile_deps_path='sysroot'
+        )
+
+        # Setup shell
+        shell.dry_run = True
+        self._orig_stdout = sys.stdout
+        self._orig_stderr = sys.stderr
+        self.stdout = StringIO()
+        self.stderr = StringIO()
+        sys.stdout = self.stdout
+        sys.stderr = self.stderr
+
+    def tearDown(self):
+        sys.stdout = self._orig_stdout
+        sys.stderr = self._orig_stderr
+        shell.dry_run = False
+        self.toolchain = None
+        self.args = None
+
+    def test_llvm_get_linux_sysroot(self):
+        llvm = LLVM(
+            args=self.args,
+            toolchain=self.toolchain,
+            source_dir='/path/to/src',
+            build_dir='/path/to/build')
+        expected_arg = '/usr/aarch64-linux-gnu'
+        self.assertIn(expected_arg, llvm.get_linux_sysroot("linux", "aarch64"))