From: Sebastian Poeplau <poep...@adacore.com> gcc/ada/ChangeLog:
* doc/gnat_ugn/building_executable_programs_with_gnat.rst: Move recommendation of Toolchain_Name up. * gnat_ugn.texi: Regenerate. Tested on x86_64-pc-linux-gnu, committed on master. --- ...building_executable_programs_with_gnat.rst | 26 ++++++++-------- gcc/ada/gnat_ugn.texi | 30 +++++++++---------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst index fdf19481a6fc..2a26e4659b8b 100644 --- a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst +++ b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst @@ -8116,20 +8116,18 @@ We provide two options that you can use to build code with GNAT LLVM: * ``gprbuild`` can detect and use GNAT LLVM when it is installed. - ``gprbuild`` uses the first applicable compiler on the executable - search path, including GNAT LLVM. An easy way to build with GNAT - LLVM is to make it available on the operating system's search path - before any other Ada compiler (such as the GCC version of GNAT). To - avoid accidentally using a different compiler than the one you want - to use, we recommend generating an explicit toolchain configuration - file with ``gprconfig`` and using it with ``gprbuild``; see the - *GPRbuild and GPR Companion Tools User's Guide* for details. You - can determine from the first line of the :file:`.ali` file - which version of GNAT built that file because it contains either - :code:`GNAT` or :code:`GNAT-LLVM`. - - You can also explicitly select GNAT LLVM in your existing GPR project - file by adding :code:`for Toolchain_Name("Ada") use "GNAT_LLVM";` + ``gprbuild`` uses the first applicable compiler on the executable search + path, including GNAT LLVM. An easy way to build with GNAT LLVM is to make + it available on the operating system's search path before any other Ada + compiler (such as the GCC version of GNAT). To avoid accidentally using a + different compiler than the one you want to use, we recommend explicitly + selecting GNAT LLVM in your existing GPR project file by adding + :code:`for Toolchain_Name ("Ada") use "GNAT_LLVM";`. You can also + generate an explicit toolchain configuration file with ``gprconfig`` and + use it with ``gprbuild``; see the *GPRbuild and GPR Companion Tools + User's Guide* for details. You can determine from the first line of the + :file:`.ali` file which version of GNAT built that file because it + contains either :code:`GNAT` or :code:`GNAT-LLVM`. .. only:: PRO diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index 48958f89256e..e0c2d2571f61 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -19,7 +19,7 @@ @copying @quotation -GNAT User's Guide for Native Platforms , Sep 05, 2025 +GNAT User's Guide for Native Platforms , Sep 12, 2025 AdaCore @@ -17653,20 +17653,18 @@ version of GNAT. @item @code{gprbuild} can detect and use GNAT LLVM when it is installed. -@code{gprbuild} uses the first applicable compiler on the executable -search path, including GNAT LLVM. An easy way to build with GNAT -LLVM is to make it available on the operating system’s search path -before any other Ada compiler (such as the GCC version of GNAT). To -avoid accidentally using a different compiler than the one you want -to use, we recommend generating an explicit toolchain configuration -file with @code{gprconfig} and using it with @code{gprbuild}; see the -`GPRbuild and GPR Companion Tools User’s Guide' for details. You -can determine from the first line of the @code{.ali} file -which version of GNAT built that file because it contains either -@code{GNAT} or @code{GNAT-LLVM}. - -You can also explicitly select GNAT LLVM in your existing GPR project -file by adding @code{for Toolchain_Name("Ada") use "GNAT_LLVM";} +@code{gprbuild} uses the first applicable compiler on the executable search +path, including GNAT LLVM. An easy way to build with GNAT LLVM is to make +it available on the operating system’s search path before any other Ada +compiler (such as the GCC version of GNAT). To avoid accidentally using a +different compiler than the one you want to use, we recommend explicitly +selecting GNAT LLVM in your existing GPR project file by adding +@code{for Toolchain_Name ("Ada") use "GNAT_LLVM";}. You can also +generate an explicit toolchain configuration file with @code{gprconfig} and +use it with @code{gprbuild}; see the `GPRbuild and GPR Companion Tools +User’s Guide' for details. You can determine from the first line of the +@code{.ali} file which version of GNAT built that file because it +contains either @code{GNAT} or @code{GNAT-LLVM}. @end itemize @@ -30297,8 +30295,8 @@ to permit their use in free software. @printindex ge -@anchor{gnat_ugn/gnat_utility_programs switches-related-to-project-files}@w{ } @anchor{d2}@w{ } +@anchor{gnat_ugn/gnat_utility_programs switches-related-to-project-files}@w{ } @c %**end of body @bye -- 2.43.0