From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id CFEC23858D28 for ; Tue, 17 Jan 2023 08:14:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CFEC23858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x42a.google.com with SMTP id d2so9586117wrp.8 for ; Tue, 17 Jan 2023 00:14:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:from:to:cc:subject:date:message-id :reply-to; bh=5b54GDDC4WS6W2xJFcWZIaahinxyE/dIC/asB2Q3myI=; b=bXxbs3RgFIsnl7yD6G2OsDQNhcK+ENQbalPMXz2GeCgdY48qdrpZr5HKWl+KCrcGfA MWkz2sjjIMbVhv8mx9XfmE4+gO1wspRETcD7+jbUG6MY6BigqVaM0fw3swa2nhlEyH0I DmGHKwvdNLtjuytL8hOB+U0WmjbJJrvyERtl1XqtfiLxAw5cPb0fOwX5qPattjSJq4GB neobEt2F+lbuib8Bfu4GdwnRuyqXcvcr4755xlEzok0c1tOnXv0KQp3YJdjYyfBaeyc9 R392A/tL1NLQwUJx+NqtMhYNDNmbodlwjhOIUcPMJ2vx9Aq/Sci2udmpJuH0IZ6DjAG/ ikBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5b54GDDC4WS6W2xJFcWZIaahinxyE/dIC/asB2Q3myI=; b=Mo5Tv2WF0gYG2cZKgRyGhO1U1oDBD9djFGHHFYSkvDSTXEHNeJ5kXjG12Kjy3MBz/Q 6qS5lesQbe7Vtrlm1s534ojGRhSL8gXIDQuVU5TOrjIk/GT+iAXTpSC/0iyUpddBW3be KTZ4sXe+n2OB07WxIeZ0zP7ShV2AGITaTZ0aMck4E0bzY7t/HXCVRJAFwu5Aey/KgEr9 dXhGdAWJwxkvhxa008v3H6S3dXb8SEHYAbFAEdQsWHpIZy/DDRcN2prJmTftSw3igIDn Cpo+ul1UUGBo+SB9ZNYcaeko+76qhunGPYDTDDXeRvZ9Z9+hbrZLrZAm5nVXxxjCLF46 pjkQ== X-Gm-Message-State: AFqh2kqpU9HGktFxCs51BBSxq8gRqcjuMg4VXw49fFjG1YCnhVt0deu2 9zNhxZWabJPt1DqF7DHYY/xMo7V8tdOBP5CkTJvabR7o X-Google-Smtp-Source: AMrXdXtrZDYGR6QoJ1L8BGHS/3wqbNdXhoFSKn/Rf3p15PtnJh90+RvMyMMq4nzakOHl5XSFgp+ZZQ== X-Received: by 2002:adf:d846:0:b0:2bc:8073:760c with SMTP id k6-20020adfd846000000b002bc8073760cmr2222805wrl.17.1673943280409; Tue, 17 Jan 2023 00:14:40 -0800 (PST) Received: from smtpclient.apple (2a01cb06a010b078b5fa1f8619092c3d.ipv6.abo.wanadoo.fr. [2a01:cb06:a010:b078:b5fa:1f86:1909:2c3d]) by smtp.gmail.com with ESMTPSA id i6-20020adfe486000000b002423dc3b1a9sm27691361wrm.52.2023.01.17.00.14.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jan 2023 00:14:39 -0800 (PST) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Arnaud Charlet Mime-Version: 1.0 (1.0) Subject: Re: [PATCH] ada: Respect GNATMAKE Date: Tue, 17 Jan 2023 09:14:23 +0100 Message-Id: <699516CC-7DC9-4F58-9E7D-F44B25BFB68D@adacore.com> References: <20230117012518.3382059-1-pefoley2@pefoley.com> Cc: gcc-patches@gcc.gnu.org In-Reply-To: <20230117012518.3382059-1-pefoley2@pefoley.com> To: Peter Foley X-Mailer: iPhone Mail (20B110) X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: > =EF=BB=BFUse the GNATMAKE variables consistently. > Avoids failures when bootstraping with a custom GNATMAKE value. >=20 > gcc/ada/ChangeLog: >=20 > * Make-generated.in: Use GNATMAKE. > * gcc-interface/Makefile.in: Ditto. Ok, thanks. > Signed-off-by: Peter Foley > --- > gcc/ada/Make-generated.in | 6 +++--- > gcc/ada/gcc-interface/Makefile.in | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/gcc/ada/Make-generated.in b/gcc/ada/Make-generated.in > index 948fc508a56..34c86b2cd63 100644 > --- a/gcc/ada/Make-generated.in > +++ b/gcc/ada/Make-generated.in > @@ -18,7 +18,7 @@ GEN_IL_FLAGS =3D -gnata -gnat2012 -gnatw.g -gnatyg -gnat= U $(GEN_IL_INCLUDES) > ada/seinfo_tables.ads ada/seinfo_tables.adb ada/sinfo.h ada/einfo.h ada/nm= ake.ads ada/nmake.adb ada/seinfo.ads ada/sinfo-nodes.ads ada/sinfo-nodes.adb= ada/einfo-entities.ads ada/einfo-entities.adb: ada/stamp-gen_il ; @true > ada/stamp-gen_il: $(fsrcdir)/ada/gen_il* > $(MKDIR) ada/gen_il > - cd ada/gen_il; gnatmake -q -g $(GEN_IL_FLAGS) gen_il-main > + cd ada/gen_il; $(GNATMAKE) -q -g $(GEN_IL_FLAGS) gen_il-main > # Ignore errors to work around finalization issues in older compilers > - cd ada/gen_il; ./gen_il-main > $(fsrcdir)/../move-if-change ada/gen_il/seinfo_tables.ads ada/seinfo_ta= bles.ads > @@ -39,14 +39,14 @@ ada/stamp-gen_il: $(fsrcdir)/ada/gen_il* > # would cause bootstrapping with older compilers to fail. You can call it b= y > # hand, as a sanity check that these files are legal. > ada/seinfo_tables.o: ada/seinfo_tables.ads ada/seinfo_tables.adb > - cd ada ; gnatmake $(GEN_IL_INCLUDES) seinfo_tables.adb -gnatU -gnatX > + cd ada ; $(GNATMAKE) $(GEN_IL_INCLUDES) seinfo_tables.adb -gnatU -gna= tX >=20 > ada/snames.h ada/snames.ads ada/snames.adb : ada/stamp-snames ; @true > ada/stamp-snames : ada/snames.ads-tmpl ada/snames.adb-tmpl ada/snames.h-tm= pl ada/xsnamest.adb ada/xutil.ads ada/xutil.adb > -$(MKDIR) ada/bldtools/snamest > $(RM) $(addprefix ada/bldtools/snamest/,$(notdir $^)) > $(CP) $^ ada/bldtools/snamest > - cd ada/bldtools/snamest; gnatmake -q xsnamest ; ./xsnamest > + cd ada/bldtools/snamest; $(GNATMAKE) -q xsnamest ; ./xsnamest > $(fsrcdir)/../move-if-change ada/bldtools/snamest/snames.ns ada/snames.= ads > $(fsrcdir)/../move-if-change ada/bldtools/snamest/snames.nb ada/snames.= adb > $(fsrcdir)/../move-if-change ada/bldtools/snamest/snames.nh ada/snames.= h > diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Mak= efile.in > index da6a56fcec8..c8c38acf447 100644 > --- a/gcc/ada/gcc-interface/Makefile.in > +++ b/gcc/ada/gcc-interface/Makefile.in > @@ -616,7 +616,7 @@ OSCONS_EXTRACT=3D$(GCC_FOR_ADA_RTS) $(GNATLIBCFLAGS_FO= R_C) -S s-oscons-tmplt.i > -$(MKDIR) ./bldtools/oscons > $(RM) $(addprefix ./bldtools/oscons/,$(notdir $^)) > $(CP) $^ ./bldtools/oscons > - (cd ./bldtools/oscons ; gnatmake -q xoscons) > + (cd ./bldtools/oscons ; $(GNATMAKE) -q xoscons) >=20 > $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR) s-oscons-tmplt.c gsock= et.h ./bldtools/oscons/xoscons > $(RM) $(RTSDIR)/s-oscons-tmplt.i $(RTSDIR)/s-oscons-tmplt.s > --=20 > 2.39.0 >=20