From eb70e86f3ff61e4b97c6e660607637bf46460e58 Mon Sep 17 00:00:00 2001 From: Ernesto de Gracia Herranz Date: Tue, 4 Jun 2024 14:39:54 +0200 Subject: [PATCH 1/2] sysroot --- reference/tools/meson/mesontoolchain.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/reference/tools/meson/mesontoolchain.rst b/reference/tools/meson/mesontoolchain.rst index b9342b5ecf62..6931deab77b4 100644 --- a/reference/tools/meson/mesontoolchain.rst +++ b/reference/tools/meson/mesontoolchain.rst @@ -207,6 +207,7 @@ conf - ``tools.build:defines`` list of preprocessor definitions, each of which will be prefixed with ``-D`` and passed to ``cpp_args`` and ``c_args``. - ``tools.build:compiler_executables`` dict-like Python object which specifies the compiler as key and the compiler executable path as value. Those keys will be mapped as follows: +- ``tools.build:sysroot`` which accepts a path to the system root directory and sets the ``--sysroot`` flag. * ``c``: will set ``c`` in ``[binaries]`` section from *conan_meson_xxxx.ini*. * ``cpp``: will set ``cpp`` in ``[binaries]`` section from *conan_meson_xxxx.ini*. From b0584a835e973c512615a1a83d8395fc05f0034e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Ram=C3=ADrez?= Date: Tue, 4 Jun 2024 15:09:18 +0200 Subject: [PATCH 2/2] Update reference/tools/meson/mesontoolchain.rst --- reference/tools/meson/mesontoolchain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/tools/meson/mesontoolchain.rst b/reference/tools/meson/mesontoolchain.rst index 6931deab77b4..832de41c6ede 100644 --- a/reference/tools/meson/mesontoolchain.rst +++ b/reference/tools/meson/mesontoolchain.rst @@ -207,7 +207,7 @@ conf - ``tools.build:defines`` list of preprocessor definitions, each of which will be prefixed with ``-D`` and passed to ``cpp_args`` and ``c_args``. - ``tools.build:compiler_executables`` dict-like Python object which specifies the compiler as key and the compiler executable path as value. Those keys will be mapped as follows: -- ``tools.build:sysroot`` which accepts a path to the system root directory and sets the ``--sysroot`` flag. +- ``tools.build:sysroot`` which accepts a path to the system root directory and sets the ``--sysroot`` flag that is used by ``c_args``, ``cpp_args``, ``c_link_args`` and ``cpp_link_args``. * ``c``: will set ``c`` in ``[binaries]`` section from *conan_meson_xxxx.ini*. * ``cpp``: will set ``cpp`` in ``[binaries]`` section from *conan_meson_xxxx.ini*.