From fb7e79a57de713be93f0be0f3f0c8c8aef408ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Creuse?= <creuse@adacore.com>
Date: Thu, 18 Apr 2024 17:15:37 +0200
Subject: [PATCH] Test: fix integration Makefile for cross targets

This includes unifying the handling of --implicit-with to avoid
duplicate switches, and forcing the rebuild of all units in binary
traces to ensure the proper SCOs are generated each time.
---
 src/test-harness.adb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/test-harness.adb b/src/test-harness.adb
index 1e47fa53..69712b22 100755
--- a/src/test-harness.adb
+++ b/src/test-harness.adb
@@ -4108,8 +4108,7 @@ package body Test.Harness is
         (0,
          ASCII.HT
          & "$(GPRBUILD) $(BUILDERFLAGS) -P$*.gpr $(GPRFLAGS)"
-         & " -o $(notdir $*)$(EXE_EXT) --src-subdirs=gnatcov-instr "
-         & "--implicit-with=gnatcov_rts");
+         & " -o $(notdir $*)$(EXE_EXT) --src-subdirs=gnatcov-instr");
       Put_New_Line;
       Put_New_Line;
 
@@ -4231,12 +4230,10 @@ package body Test.Harness is
          Put_New_Line;
       end if;
 
-      if not Target_Native then
-         S_Put (0, "inst-coverage: BUILDERFLAGS+="
+      S_Put (0, "inst-coverage: BUILDERFLAGS+="
                 & "--implicit-with=$(if $(GNATCOV_RTS),$(GNATCOV_RTS),"
                 & "gnatcov_rts.gpr)");
-         Put_New_Line;
-      end if;
+      Put_New_Line;
       S_Put (0, "inst-coverage: gnatcov-consolidate");
       Put_New_Line;
       Put_New_Line;