From 7a273d6cacf61389fcdf04f3d3b411e8ab47059a Mon Sep 17 00:00:00 2001 From: James Date: Wed, 4 Sep 2024 12:27:01 +0200 Subject: [PATCH] revert Meson system=baremetal (#16929) --- conan/tools/meson/helpers.py | 1 - .../toolchains/meson/test_mesontoolchain.py | 20 ------------------- 2 files changed, 21 deletions(-) diff --git a/conan/tools/meson/helpers.py b/conan/tools/meson/helpers.py index abcb154386b..6e6861abcb9 100644 --- a/conan/tools/meson/helpers.py +++ b/conan/tools/meson/helpers.py @@ -19,7 +19,6 @@ 'Windows': 'windows', 'WindowsCE': 'windows', 'WindowsStore': 'windows', - 'baremetal': 'none' } # https://mesonbuild.com/Reference-tables.html#cpu-families diff --git a/test/integration/toolchains/meson/test_mesontoolchain.py b/test/integration/toolchains/meson/test_mesontoolchain.py index 3f568846a5c..d9ca23ea9e4 100644 --- a/test/integration/toolchains/meson/test_mesontoolchain.py +++ b/test/integration/toolchains/meson/test_mesontoolchain.py @@ -646,23 +646,3 @@ def test_meson_sysroot_app(): assert re.search(r"c_link_args =.+--sysroot={}.+".format(sysroot), conan_meson) assert re.search(r"cpp_args =.+--sysroot={}.+".format(sysroot), conan_meson) assert re.search(r"cpp_link_args =.+--sysroot={}.+".format(sysroot), conan_meson) - - -def test_baremetal_cross_compiling(): - profile_baremetal = textwrap.dedent(""" - [settings] - arch=x86_64 - os=baremetal - compiler=gcc - compiler.cppstd=gnu17 - compiler.libcxx=libstdc++11 - compiler.version=13 - build_type=Release - """) - - client = TestClient() - client.save({"conanfile.txt": "", - "baremetal": profile_baremetal}) - client.run("install . --profile:build=default --profile:host=baremetal -g MesonToolchain") - content = client.load("conan_meson_cross.ini") - assert "system = 'none'" in content