Skip to content

Commit 92e81a3

Browse files
authored
Merge pull request #3728 from conan-io/release/2.3
sync develop2 with release/2.3
2 parents 3cf2a48 + 27cd049 commit 92e81a3

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

examples/cross_build/toolchain_packages.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Please, first clone the sources to recreate this project. You can find them in t
3131
Here, you will find a Conan recipe (and the *test_package*) to package an ARM toolchain
3232
for cross-compiling to Linux ARM for both 32 and 64 bits. To simplify a bit, we are
3333
assuming that we can just cross-build from Linux x86_64 to Linux ARM, both 32 and 64 bits.
34+
If you're looking for another example, you can explore an additional MacOs to Linux cross-build example right
35+
`here <https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross>`_ .
3436

3537
.. code-block:: bash
3638
@@ -485,3 +487,4 @@ architecture of the resulting executable, confirming its alignment with the targ
485487

486488
- :ref:`More info on settings_target<binary_model_extending_cross_build_target_settings>`
487489
- :ref:`Cross-compile your applications using Conan<consuming_packages_cross_building_with_conan>`
490+
- `Another example of cross-compilation from Macos to Linux <https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross>`_

reference/runners/docker.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ If you need more control over the build and execution of the container, you can
6060
How to run a `conan create` in a runner
6161
---------------------------------------
6262

63+
.. note::
64+
65+
The docker runner feature is only supported by ``conan create`` command. The ``conan install --build`` command is not supported.
66+
6367
In the following links you can find some examples about how to use a conan docker runner:
6468

6569
- :ref:`Creating a Conan package using a Docker runner<examples_runners_docker_basic>`
66-
- :ref:`Using a docker runner configfile to parameterize the Dockerfile base image<examples_runners_docker_configfile_build_args>`
70+
- :ref:`Using a docker runner configfile to parameterize the Dockerfile base image<examples_runners_docker_configfile_build_args>`

0 commit comments

Comments
 (0)