From patchwork Tue Jan 17 01:25:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Foley X-Patchwork-Id: 63260 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C1B08385842B for ; Tue, 17 Jan 2023 01:25:38 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) by sourceware.org (Postfix) with ESMTPS id 3D0703858D28 for ; Tue, 17 Jan 2023 01:25:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3D0703858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=pefoley.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=pefoley.com Received: by mail-qv1-xf2c.google.com with SMTP id p96so8602341qvp.13 for ; Mon, 16 Jan 2023 17:25:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pefoley.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dmC9FlHMDBE9ngpJB3Zkxq9q+oMjGKrqKlK3DbT8C/Q=; b=rJ+zmNlMvCviVJYhUA39WnTjHxcidHVWvQbH5OFPD+MnQ8uPLRYRXdcaFd6EtfyfWJ dbdtbw4MTrA5bhJpnix3eZrk8p71ZOZnty6psj/j7Qhaq6tpjBUw0yJVk9ge9bo0Y35u Mfe3FJTUsp8B8Px0yvS0t+ETaos4steotG8iM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dmC9FlHMDBE9ngpJB3Zkxq9q+oMjGKrqKlK3DbT8C/Q=; b=aBmiWFHoBjtuVkoJ+y2tVAdAKw9Sf5EoIc+8IczIoguiGC96/sMBnEc8JCCdkmnv/a mjJQr/WOQvXe6+U1RVVIsaLHX9IYXJsDbi/y9e45ckEiKIY6JfSuGwQNLAKU59+bLhmx y9Y+Qi3AImx/xnub/RYNT7jLnePiwzeiJoJukq4b5XANcJDGKZIgGBcg1TDti9zqwiIG 0pDX5NEmreLHtXChjImaNytAZD7n9IGVgpi89wYXcPA51JoP0FXcCaoYOSvUr8jVn+g1 kq3twB7pNybNtKY/lfDq06Xm5jDtwPfzXeERFmMBGgZwgJbiyJtxvDg4yubE1pyVjudC PgrQ== X-Gm-Message-State: AFqh2ko2tKhO2auCtstqQAmvfprb322lUo/m1apgnk5Bt2mPO2GOA8fK 5Iv47LBrbgsK4KSDPrnqcRTzOOqNDjxJiktSqUQ/zA== X-Google-Smtp-Source: AMrXdXv8JE2tY59vP1iBWEydcXHRFImb8r+Vm3OziLo6K6QDpdhmT2v9G+hUiFy+6CSTFjiMFPWSyw== X-Received: by 2002:a05:6214:3682:b0:532:2ff8:fcef with SMTP id nl2-20020a056214368200b005322ff8fcefmr2171190qvb.42.1673918721081; Mon, 16 Jan 2023 17:25:21 -0800 (PST) Received: from bronx.pefoley.com ([2600:4040:29fb:d300:887b:7eff:fe74:68b2]) by smtp.gmail.com with ESMTPSA id f1-20020a05620a280100b006eef13ef4c8sm19418303qkp.94.2023.01.16.17.25.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 17:25:20 -0800 (PST) From: Peter Foley To: gcc-patches@gcc.gnu.org Cc: Peter Foley Subject: [PATCH] ada: Respect GNATMAKE Date: Mon, 16 Jan 2023 20:25:18 -0500 Message-Id: <20230117012518.3382059-1-pefoley2@pefoley.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-14.1 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Use the GNATMAKE variables consistently. Avoids failures when bootstraping with a custom GNATMAKE value. gcc/ada/ChangeLog: * Make-generated.in: Use GNATMAKE. * gcc-interface/Makefile.in: Ditto. 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(-) 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 = -gnata -gnat2012 -gnatw.g -gnatyg -gnatU $(GEN_IL_INCLUDES) ada/seinfo_tables.ads ada/seinfo_tables.adb ada/sinfo.h ada/einfo.h ada/nmake.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_tables.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 by # 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 -gnatX 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-tmpl 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/Makefile.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=$(GCC_FOR_ADA_RTS) $(GNATLIBCFLAGS_FOR_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) $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR) s-oscons-tmplt.c gsocket.h ./bldtools/oscons/xoscons $(RM) $(RTSDIR)/s-oscons-tmplt.i $(RTSDIR)/s-oscons-tmplt.s