Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert Meson system=baremetal #16929

Merged
merged 1 commit into from
Sep 4, 2024
Merged

revert Meson system=baremetal #16929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion conan/tools/meson/helpers.py
View file
Open in desktop
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
View file
Open in desktop
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