lang/gnat-aux: Modify rpath handling for shared project libraries

The GNAT compiler project builder essentially doesn't support DESTDIR
out of the box.  By default, it sets rpath of shared libraries to the
directory to which they are installed.  One may add additional rpaths
through switches, but not remove these default ones.  Also added to
the default rpath are the paths to the ada library and the standard
localbase library.

This modification to the compiler will force the project builder to
recognize the -R switch (gnatlink uses this to disable rpaths), and
it reacts by not putting the library install path into rpath.  The
adalib and ${LOCALBASE}/lib paths will still make up the base rpath
definition of the built shared libraries.

This change was prompted by the rpath troubles of the XML/Ada package.


(marino)

--- gcc/ada/mlib-prj.adb
+++ gcc/ada/mlib-prj.adb
@@ -341,6 +341,11 @@ package body MLib.Prj is
 
       Foreign_Sources : Boolean;
 
+      Rpath_Disabled : Boolean := False;
+      --  If -R is passed through the library options for the linker, it will
+      --  prevent the implemented libraries portion of the rpath switch from
+      --  being built, even if the linker is capable of supporting rpath.
+
       Rpath : String_Access := null;
       --  Allocated only if Path Option is supported
 
@@ -790,7 +795,7 @@ package body MLib.Prj is
             Opts.Table (Opts.Last) :=
               new String'("-L" & Name_Buffer (1 .. Name_Len));
 
-            if Path_Option /= null then
+            if not Rpath_Disabled and then Path_Option /= null then
                Add_Rpath (Name_Buffer (1 .. Name_Len));
             end if;
 
@@ -1285,6 +1290,9 @@ package body MLib.Prj is
                      Opts.Increment_Last;
                      Opts.Table (Opts.Last) :=
                        new String'(Name_Buffer (1 .. Name_Len));
+                     if Name_Len = 2 and then Name_Buffer (1 .. 2) = "-R" then
+                        Rpath_Disabled := True;
+                     end if;
                   end if;
 
                   Current := Element.Next;