re PR ada/85036 (--disable-bootstrap --enable-languages=ada[,c++] fails)

	PR ada/85036
	* gnatlink.adb (Process_Args): Drop existing link switches if multiple
	switches are passed for --LINK.

From-SVN: r258827

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index cb071fe..d75028d 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR ada/85036
+       * gnatlink.adb (Process_Args): Drop existing link switches if multiple
+       switches are passed for --LINK.
+
 2018-03-12  Eric Botcazou  <ebotcazou@adacore.com>
 
        PR ada/82813

diff --git a/gcc/ada/gnatlink.adb b/gcc/ada/gnatlink.adb
index e28ba34..cea664b 100644 (file)
--- a/gcc/ada/gnatlink.adb
+++ b/gcc/ada/gnatlink.adb
@@ -544,6 +544,11 @@ procedure Gnatlink is
                      end if;
 
                      --  The other arguments are passed as-is to the linker
+                     --  and override those coming from --GCC= if any.
+
+                     if L_Args.all'Last >= 2 then
+                        Gcc_Linker_Options.Set_Last (0);
+                     end if;
 
                      for J in 2 .. L_Args.all'Last loop
                         Gcc_Linker_Options.Increment_Last;