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

- Bugfix: use new tools.cross_building in MesonToolchain #9992

Merged
merged 2 commits into from
Nov 11, 2021
Merged

- Bugfix: use new tools.cross_building in MesonToolchain #9992

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fb4a6c
- [MesonToolchain] fix cross-building
SSE4 Nov 9, 2021
0c8f8e0
- add test
SSE4 Nov 10, 2021
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
2 changes: 1 addition & 1 deletion conan/tools/meson/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from conan.tools.env import VirtualBuildEnv
from conan.tools.microsoft import VCVars
from conans.client.build.cppstd_flags import cppstd_from_settings
from conans.client.tools.oss import cross_building, get_cross_building_settings
from conan.tools.cross_building import cross_building, get_cross_building_settings
from conans.util.files import save


Expand Down