Skip to content

Commit

Permalink
revert Meson system=baremetal (#16929)
Browse files Browse the repository at this point in the history
  • Loading branch information
memsharded authored Sep 4, 2024
1 parent 701bb31 commit 7a273d6
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
1 change: 0 additions & 1 deletion conan/tools/meson/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
'Windows': 'windows',
'WindowsCE': 'windows',
'WindowsStore': 'windows',
'baremetal': 'none'
}

# https://mesonbuild.com/Reference-tables.html#cpu-families
Expand Down
20 changes: 0 additions & 20 deletions test/integration/toolchains/meson/test_mesontoolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 7a273d6

Please sign in to comment.