Patchwork back to the Ada target vs target_alias issue wrt target pairs

login
register
mail settings
Submitter Dominique Dhumieres
Date Sept. 13, 2013, 6:03 p.m.
Message ID <20130913180305.E562C3BE1B@mailhost.lps.ens.fr>
Download mbox | patch
Permalink /patch/274834/
State New
Headers show

Comments

Dominique Dhumieres - Sept. 13, 2013, 6:03 p.m.
The bootstrap failure is fixed with the following patch:

[macbook] gcc/work% diff -up ../_clean/gcc/ada/gcc-interface/Makefile.in gcc/ada/gcc-interface/Makefile.in

Notes:
1) I did not check for other typos.
2) I don't have write access.

Dominique
Olivier Hainque - Sept. 13, 2013, 9:35 p.m.
Hello Dominique,

On Sep 13, 2013, at 20:03 , dominiq@lps.ens.fr (Dominique Dhumieres) wrote:

> The bootstrap failure is fixed with the following patch:
> 
> [macbook] gcc/work% diff -up ../_clean/gcc/ada/gcc-interface/Makefile.in gcc/ada/gcc-interface/Makefile.in
> --- ../_clean/gcc/ada/gcc-interface/Makefile.in	2013-09-12 13:18:34.000000000 +0200
> +++ gcc/ada/gcc-interface/Makefile.in	2013-09-13 16:58:58.000000000 +0200
> @@ -2190,7 +2190,7 @@ ifeq ($(strip $(filter-out %x32 linux%,$
> endif
> 
> # Darwin (Mac OS X)
> -ifeq ($(strip $(filter-out darwin%,$(target_cpu))),)
> +ifeq ($(strip $(filter-out darwin%,$(target_os))),)

 Oops, correct. Mistake of mine during a conflict resolution.

> Notes:
> 1) I did not check for other typos.
> 2) I don't have write access.


 I'll take care of committing. Thanks!

 Olivier
Olivier Hainque - Sept. 13, 2013, 9:43 p.m.
On Sep 13, 2013, at 23:35 , Olivier Hainque <hainque@adacore.com> wrote:

>> # Darwin (Mac OS X)
>> -ifeq ($(strip $(filter-out darwin%,$(target_cpu))),)
>> +ifeq ($(strip $(filter-out darwin%,$(target_os))),)

>> 2) I don't have write access.
> 
> I'll take care of committing. Thanks!

 rev 202578. Thanks again Dominique.

 Olivier

Patch

--- ../_clean/gcc/ada/gcc-interface/Makefile.in	2013-09-12 13:18:34.000000000 +0200
+++ gcc/ada/gcc-interface/Makefile.in	2013-09-13 16:58:58.000000000 +0200
@@ -2190,7 +2190,7 @@  ifeq ($(strip $(filter-out %x32 linux%,$
 endif
 
 # Darwin (Mac OS X)
-ifeq ($(strip $(filter-out darwin%,$(target_cpu))),)
+ifeq ($(strip $(filter-out darwin%,$(target_os))),)
   SO_OPTS = -shared-libgcc
   LIBGNAT_TARGET_PAIRS = \
     a-intnam.ads<a-intnam-darwin.ads \