Merge branch 'topic/kliemann/certified-rts-9' into 'master'

Fix shared runtime builds See merge request eng/toolchain/bb-runtimes!41
AdaCore · Sep 26, 2023 · 7e741e3 · 7e741e3
2 parents 001cbf8 + 458e5f5
commit 7e741e3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/support/data/ravenscar_build.gpr.in b/support/data/ravenscar_build.gpr.in
@@ -18,10 +18,6 @@ project Ravenscar_Build is
 
    for Source_Dirs use ("{source_dirs}");
 
-   package Builder is
-      for Default_Switches ("Ada") use Target_Options.LFLAGS;
-   end Builder;
-
    package Compiler is
       for Default_Switches ("C") use Target_Options.GNARL_CFLAGS;
       for Default_Switches ("Ada") use Target_Options.GNARL_ADAFLAGS;

diff --git a/support/data/runtime_build.gpr.in b/support/data/runtime_build.gpr.in
@@ -20,10 +20,6 @@ project Runtime_Build is
      for Spec_Suffix ("Asm_CPP") use ".inc";
   end Naming;
 
-  package Builder is
-     for Default_Switches ("Ada") use Target_Options.LFLAGS;
-  end Builder;
-
   package Compiler is
      for Default_Switches ("C") use Target_Options.ALL_CFLAGS;
      for Default_Switches ("Ada") use Target_Options.ALL_ADAFLAGS;

diff --git a/support/data/target_options.gpr b/support/data/target_options.gpr
@@ -41,7 +41,6 @@ abstract project Target_Options is
                                 "-fpreserve-control-flow");
   end case;
   --  Linker flags, used for building shared libraries
-  LFLAGS := ();
   LOPTIONS := ();
   case Lib is
      when "static" =>
@@ -52,9 +51,8 @@ abstract project Target_Options is
         --  link against libgnat (itself).
         --  Since -nostdlib also removes libgcc
         --  from the linked libraries we have to
-        --  add -lm again.
-        LFLAGS := LFLAGS & ("-nostdlib");
-        LOPTIONS := LOPTIONS & ("-lgcc");
+        --  add -lgcc again.
+        LOPTIONS := LOPTIONS & ("-nostdlib", "-lgcc");
   end case;
 
   --  Concatenate with common flags