--- a/db/compilers.xml 2019-06-01 21:29:57.611722804 +0200 +++ b/db/compilers.xml 2019-06-01 21:42:56.000608601 +0200 @@ -20,7 +20,7 @@ GCC - (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-freebsd.*)?gcc(-\d+)? + (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-freebsd.*)?gcc-@VER@ $EXEC -v @@ -189,18 +189,18 @@ --> GNAT - (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gnatls + (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|.*linux-android.*|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-fastos.*|.*-freebsd.*|.*-qnx.*|.*-rtems.*)?gnatls-@VER@ - ${PREFIX}gnatls -v --version + ${EXEC} -v --version Ada - ${PREFIX}gcc -v + ${PREFIX}gcc-@VER@ -v - ${PREFIX}gcc -v + ${PREFIX}gcc-@VER@ -v @@ -210,7 +210,7 @@ \.\./$TARGET/lib(32|64)?/gnat/(.*)/adalib/ - ${PREFIX}gcc -dumpmachine + ${PREFIX}gcc-@VER@ -dumpmachine @@ -302,7 +302,7 @@ C_LLVM - clang + fake-clang clang --version --- a/db/gnat.xml 2019-06-01 21:53:53.383281607 +0200 +++ b/db/gnat.xml 2019-06-01 21:57:08.414196529 +0200 @@ -10,7 +10,7 @@ &filter_gnat; package Compiler is - for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc"; + for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@"; for Language_Kind ("Ada") use "unit_based"; for Dependency_Kind ("Ada") use "ALI_File"; for Leading_Required_Switches ("Ada") use @@ -27,6 +27,9 @@ for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE"; for Driver ("Ada") use "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind"; + for Switches ("Ada") use ("--gnatbind_path=${PREFIX(ada)}gnatbind-@VER@"); + for Required_Switches ("Ada") use + Binder'Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); end Binder; for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; --- a/db/c.xml 2019-06-01 21:57:36.244755708 +0200 +++ b/db/c.xml 2019-06-01 21:59:14.919191663 +0200 @@ -25,7 +25,7 @@ package Compiler is - for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; + for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; end Compiler; --- a/db/linker.xml 2021-12-21 22:36:01.054738486 +0100 +++ b/db/linker.xml 2021-12-21 22:36:59.973738600 +0100 @@ -130,9 +130,13 @@ - for Object_Lister use ("nm", "-g"); + NM := External("NM", "nm"); + for Object_Lister use (NM, "-g"); for Object_Lister_Matcher use " [TDRB] (.*)"; + LDFLAGS := External_As_List ("LDFLAGS", " "); + for Leading_Library_Options use LDFLAGS; + package Linker is for Export_File_Format use "GNU"; for Export_File_Switch use "-Wl,--version-script="; @@ -166,32 +166,14 @@ - + - + - for Object_Lister use ("nm", "-g"); - for Object_Lister_Matcher use " [TDRBSG] (.*)"; - - package Linker is - for Export_File_Format use "GNU"; - for Export_File_Switch use "-Wl,--version-script="; - end Linker; - - - - - - - - - - - - - for Object_Lister use ("aarch64-linux-gnu-nm", "-g"); + NM := External("NM", "nm"); + for Object_Lister use (NM, "-g"); for Object_Lister_Matcher use " [TDRBSG] (.*)"; package Linker is @@ -696,34 +696,19 @@ - + - + - for Archive_Builder use ("ar", "cr"); + AR := External("AR", "ar"); + for Archive_Builder use (AR, "cr"); for Archive_Builder_Append_Option use ("q"); for Archive_Indexer use ("ranlib"); for Archive_Suffix use ".a"; - - - - - - - - - - - for Archive_Builder use ("aarch64-linux-gnu-ar", "cr"); - for Archive_Builder_Append_Option use ("q"); - for Archive_Indexer use ("aarch64-linux-gnu-ranlib"); - for Archive_Suffix use ".a"; - - @@ -1022,7 +1026,8 @@ - for Archive_Builder use ("ar", "cr"); + AR := External("AR", "ar"); + for Archive_Builder use (AR, "cr"); for Archive_Builder_Append_Option use ("q"); for Archive_Indexer use ("ranlib"); for Archive_Suffix use ".a"; @@ -1395,7 +1400,7 @@ for Library_Partial_Linker use - ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib") + ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib") & GCC_No_Pie & ("-Wl,-r", "-o"); @@ -1421,7 +1426,7 @@ for Library_Partial_Linker use - ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib") + ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib") & GCC_No_Pie & ("-Wl,-r", "-o");