diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2018-03-23 23:12:49 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2018-03-23 23:12:49 +0000 |
| commit | f8e56962463899a75aa424b93e7ba32cabddd504 (patch) | |
| tree | 9a3ec11b53bb1362381c1419457c49ed42eb715b /gcc | |
| parent | b05e29ecf955a36c00b964ff61aad878a846bc80 (diff) | |
| download | gcc-f8e56962463899a75aa424b93e7ba32cabddd504.zip gcc-f8e56962463899a75aa424b93e7ba32cabddd504.tar.gz gcc-f8e56962463899a75aa424b93e7ba32cabddd504.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/gnatlink.adb | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index cb071fe..d75028d 100644 --- 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 --- 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; |