From a2ba703980b56d69c00fdf0e6115351bd8620142 Mon Sep 17 00:00:00 2001 From: Maxime Perrotin Date: Thu, 30 Jul 2020 19:15:12 +0200 Subject: [PATCH 1/2] Mirror buildsupport call to gprconfig --- templates/concurrency_view/ada_pohi_gpr/node.tmplt | 2 +- templates/concurrency_view/c_pohi_gpr/node.tmplt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/concurrency_view/ada_pohi_gpr/node.tmplt b/templates/concurrency_view/ada_pohi_gpr/node.tmplt index ce04fdec..37ee0166 100644 --- a/templates/concurrency_view/ada_pohi_gpr/node.tmplt +++ b/templates/concurrency_view/ada_pohi_gpr/node.tmplt @@ -41,7 +41,7 @@ Ada_Drivers_Library/README.md: @@ELSE@@ all: # Configure gprbuild to use GCC toolchain (for C and C++) even if LLVM is installed - gprconfig --batch --target=x86_64-pc-linux-gnu --config=C,,,,GCC --config=C++,,,,G++ + gprconfig --batch --config=Ada,,default,,GNAT --config=C,,default,,GCC --config=C++,,default,,G++ @@TABLE@@ $(GPRBUILD) -p -P @_LOWER:Partition_Names_@.gpr -XTARGET=$(TARGET) -cargs:C -DSTATIC=static -cargs:Ada -gnatE @@END_TABLE@@ diff --git a/templates/concurrency_view/c_pohi_gpr/node.tmplt b/templates/concurrency_view/c_pohi_gpr/node.tmplt index 182a61ff..c58211f0 100644 --- a/templates/concurrency_view/c_pohi_gpr/node.tmplt +++ b/templates/concurrency_view/c_pohi_gpr/node.tmplt @@ -21,7 +21,7 @@ simulate: debug_native: # Configure gprbuild to use GCC toolchain even if LLVM is installed - gprconfig --batch --target=x86_64-pc-linux-gnu --config=C,,,,GCC --config=C++,,,,G++ + gprconfig --batch --config=Ada,,default,,GNAT --config=C,,default,,GCC --config=C++,,default,,G++ @@TABLE@@ gprbuild -v -p -P @_LOWER:Partition_Names_@.gpr -XCFG="Debug" -cargs:C -DSTATIC="" @@END_TABLE@@ -- GitLab From 55ceb1d26d7b08bc0c8d17991e225e2b2a43e8da Mon Sep 17 00:00:00 2001 From: Maxime Perrotin Date: Thu, 30 Jul 2020 20:14:10 +0200 Subject: [PATCH 2/2] Ignore gprconfig errors If gprconfig does not work on old distros (stretch), it's not important, it is only needed on buster configurations when llvm conflicts with gcc r --- templates/concurrency_view/ada_pohi_gpr/node.tmplt | 2 +- templates/concurrency_view/c_pohi_gpr/node.tmplt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/concurrency_view/ada_pohi_gpr/node.tmplt b/templates/concurrency_view/ada_pohi_gpr/node.tmplt index 37ee0166..83298ff9 100644 --- a/templates/concurrency_view/ada_pohi_gpr/node.tmplt +++ b/templates/concurrency_view/ada_pohi_gpr/node.tmplt @@ -41,7 +41,7 @@ Ada_Drivers_Library/README.md: @@ELSE@@ all: # Configure gprbuild to use GCC toolchain (for C and C++) even if LLVM is installed - gprconfig --batch --config=Ada,,default,,GNAT --config=C,,default,,GCC --config=C++,,default,,G++ + gprconfig --batch --config=Ada,,default,,GNAT --config=C,,default,,GCC --config=C++,,default,,G++ || : @@TABLE@@ $(GPRBUILD) -p -P @_LOWER:Partition_Names_@.gpr -XTARGET=$(TARGET) -cargs:C -DSTATIC=static -cargs:Ada -gnatE @@END_TABLE@@ diff --git a/templates/concurrency_view/c_pohi_gpr/node.tmplt b/templates/concurrency_view/c_pohi_gpr/node.tmplt index c58211f0..43a92974 100644 --- a/templates/concurrency_view/c_pohi_gpr/node.tmplt +++ b/templates/concurrency_view/c_pohi_gpr/node.tmplt @@ -21,7 +21,7 @@ simulate: debug_native: # Configure gprbuild to use GCC toolchain even if LLVM is installed - gprconfig --batch --config=Ada,,default,,GNAT --config=C,,default,,GCC --config=C++,,default,,G++ + gprconfig --batch --config=Ada,,default,,GNAT --config=C,,default,,GCC --config=C++,,default,,G++ || : @@TABLE@@ gprbuild -v -p -P @_LOWER:Partition_Names_@.gpr -XCFG="Debug" -cargs:C -DSTATIC="" @@END_TABLE@@ -- GitLab