From 9cd9c570617f7de60a322f666832d5737440550b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Juraj=20Linke=C5=A1?= Date: Mon, 11 Oct 2021 15:42:27 +0200 Subject: [PATCH] doc: replace machine option in build guide MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Update the docs to reflect the two new variables, cpu_instruction_set for non-arm builds and platform for arm builds. Fixes: bf66003b51ec ("build: use platform for generic and native builds") Signed-off-by: Juraj Linkeš --- doc/guides/prog_guide/build-sdk-meson.rst | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst index 877a64b061..30ce805902 100644 --- a/doc/guides/prog_guide/build-sdk-meson.rst +++ b/doc/guides/prog_guide/build-sdk-meson.rst @@ -91,7 +91,7 @@ Project-specific options are passed used -Doption=value:: meson -Denable_docs=true fullbuild # build and install docs - meson -Dmachine=generic # use builder-independent baseline -march + meson -Dcpu_instruction_set=generic # use builder-independent baseline -march meson -Ddisable_drivers=event/*,net/tap # disable tap driver and all # eventdev PMDs for a smaller build @@ -120,8 +120,16 @@ Examples of setting some of the same options using meson configure:: re-scan from meson. .. note:: - machine=generic uses a config that works on all supported architectures - regardless of the capabilities of the machine where the build is happening. + + cpu_instruction_set=generic uses an instruction set that works on + all supported architectures regardless of the capabilities of the machine + where the build is happening. + +.. note:: + + cpu_instruction_set is not used in Arm builds, as setting the instruction set + without other parameters leads to inferior builds. + The way to tailor Arm builds is to build for a SoC using -Dplatform=. As well as those settings taken from ``meson configure``, other options such as the compiler to use can be passed via environment variables. For -- 2.39.5