[MesonToolchain] needs_exe_wrapper depends on can_run function (#19382)

franramirez688 · web-flow · commit 7f2af5e987f9 · 2025-12-12T19:51:11.000+01:00
* Conditioned to can_run property

* comments

* without quotes

* Fixed test
diff --git a/conan/tools/meson/toolchain.py b/conan/tools/meson/toolchain.py
@@ -8,7 +8,7 @@
 from conan.internal.internal_tools import raise_on_universal_arch
 from conan.tools.apple.apple import is_apple_os, apple_min_version_flag, \
     resolve_apple_flags, apple_extra_flags
-from conan.tools.build.cross_building import cross_building
+from conan.tools.build.cross_building import cross_building, can_run
 from conan.tools.build.flags import (architecture_link_flag, libcxx_flags, architecture_flag,
                                      threads_flags)
 from conan.tools.env import VirtualBuildEnv
@@ -266,7 +266,8 @@ def __init__(self, conanfile, backend=None, native=False):
                 sdk_host = conanfile.settings.get_safe("os.sdk")
                 self.cross_build["host"]["subsystem"] = get_apple_subsystem(sdk_host)
                 self.cross_build["build"]["subsystem"] = get_apple_subsystem(sdk_build)
-            self.properties["needs_exe_wrapper"] = True
+            # Issue: https://github.com/conan-io/conan/issues/19217
+            self.properties["needs_exe_wrapper"] = not can_run(self._conanfile)
             if hasattr(conanfile, 'settings_target') and conanfile.settings_target:
                 settings_target = conanfile.settings_target
                 os_target = settings_target.get_safe("os")
diff --git a/test/integration/toolchains/meson/test_mesontoolchain.py b/test/integration/toolchains/meson/test_mesontoolchain.py
@@ -903,3 +903,46 @@ def generate(self):
     backend = 'xcode'
     """)
     assert expected in content
+
+
+def test_needs_exe_wrapper():
+    """
+    Tests needs_exe_wrapper depends on `can_run()` function instead of
+    simply checking the cross_building() one.
+
+    Issue: https://github.com/conan-io/conan/issues/19217
+    """
+    host = textwrap.dedent("""
+    [settings]
+    arch=x86_64
+    build_type=Release
+    compiler=apple-clang
+    compiler.cppstd=gnu17
+    compiler.libcxx=libc++
+    compiler.version=16
+    os=Macos
+    [conf]
+    tools.apple:sdk_path=/my/sdk/path
+    tools.build.cross_building:can_run=True
+    """)
+    build = textwrap.dedent("""
+    [settings]
+    arch=armv8
+    build_type=Release
+    compiler=apple-clang
+    compiler.cppstd=gnu17
+    compiler.libcxx=libc++
+    compiler.version=16
+    os=Macos
+    """)
+    client = TestClient()
+    client.save({
+        "host": host,
+        "build": build,
+        "conanfile.py": GenConanfile("pkg", "1.0")
+                        .with_settings("os", "arch", "compiler", "build_type")
+                        .with_generator("MesonToolchain")
+    })
+    client.run("install . -pr:h host -pr:b build")
+    content = client.load(MesonToolchain.cross_filename)
+    assert "needs_exe_wrapper = false" in content
