From patchwork Tue Apr 16 21:17:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 1086677 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-499345-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=gdcproject.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="lT6r3fPl"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44kJ9x757Gz9s55 for ; Wed, 17 Apr 2019 07:17:56 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=OUBKRpWnSuuS+W8CUYr2L86NaylX3EfCat+aPr/HjvdnBL Zfl9QWoinfteS8XkI8VHPIqOTb/MnjtgozEZDFieyGeo4CDI75u+/yQLj2gd2R74 joUbvyQPJIFU6NU+uRM3NqamhrVi0kRD7VVyg5ZPC3f6USQQw2CVv+Rc0wS54= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; s= default; bh=O2nbcks+ypH0x8XpNVPHjC9dxbM=; b=lT6r3fPl17jV4L2uVLf5 pF1+oOQMiMgsTFfSwzqKHvkFEelH3/vCXEIP8RONNrUYoR/M29/CKUIHhDrTMkHU e4f41RnOdvjrULtXVVsm7twFW7zySzV/SsxNlkST6EpRt2REnMwdXNinEEkquf1N O5Wshl7xTBjFHAnH5eEv+no= Received: (qmail 24253 invoked by alias); 16 Apr 2019 21:17:48 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 24236 invoked by uid 89); 16 Apr 2019 21:17:48 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=cleaning, filterout, 2797, filter-out X-HELO: mail-qk1-f182.google.com Received: from mail-qk1-f182.google.com (HELO mail-qk1-f182.google.com) (209.85.222.182) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 16 Apr 2019 21:17:46 +0000 Received: by mail-qk1-f182.google.com with SMTP id z76so13072305qkb.12 for ; Tue, 16 Apr 2019 14:17:46 -0700 (PDT) MIME-Version: 1.0 From: Iain Buclaw Date: Tue, 16 Apr 2019 23:17:33 +0200 Message-ID: Subject: [PATCH, d] Committed use build_exeext suffix for D generator programs. To: gcc-patches X-IsSubscribed: yes Hi, This patch updates the build and invocation of idgen and impcnvgen, ensuring that they are removed when cleaning the build directory. Added BUILD_LIBDEPS on the link command, which is necessary when the system installed compiler is not gcc, as noticed when testing compilation on OpenBSD. Bootstrapped and regression tested on x86_64-linux-gnu. Committed to trunk as r270397. diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in index 4e5b4a6c0c4..13b785e86a1 100644 --- a/gcc/d/Make-lang.in +++ b/gcc/d/Make-lang.in @@ -279,7 +279,8 @@ d.mostlyclean: -rm -f d/*$(objext) -rm -f d/*$(coverageexts) -rm -f $(D_GENERATED_SRCS) - -rm -f d/gdc$(exeext) gdc-cross$(exeext) d/d21$(exeext) + -rm -f d/idgen$(build_exeext) d/impcnvgen$(build_exeext) + -rm -f gdc$(exeext) gdc-cross$(exeext) d21$(exeext) d.clean: d.distclean: d.maintainer-clean: @@ -316,21 +317,23 @@ d/%.o: d/dmd/root/%.c $(D_GENERATED_SRCS) $(POSTCOMPILE) # Generated programs. -d/idgen: d/idgen.dmdgen.o - +$(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ $^ +d/idgen$(build_exeext): d/idgen.dmdgen.o $(BUILD_LIBDEPS) + +$(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ \ + $(filter-out $(BUILD_LIBDEPS), $^) $(BUILD_LIBS) -d/impcvgen: d/impcnvgen.dmdgen.o - +$(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ $^ +d/impcnvgen$(build_exeext): d/impcnvgen.dmdgen.o $(BUILD_LIBDEPS) + +$(LINKER_FOR_BUILD) $(BUILD_LINKERFLAGS) $(BUILD_LDFLAGS) -o $@ \ + $(filter-out $(BUILD_LIBDEPS), $^) $(BUILD_LIBS) # Generated sources. -d/id.c: d/idgen - cd d && ./idgen +d/id.c: d/idgen$(build_exeext) + cd d && ./idgen$(build_exeext) # idgen also generates id.h; just verify it exists. d/id.h: d/id.c -d/impcnvtab.c: d/impcvgen - cd d && ./impcvgen +d/impcnvtab.c: d/impcnvgen$(build_exeext) + cd d && ./impcnvgen$(build_exeext) d/%.dmdgen.o: $(srcdir)/d/dmd/%.c $(DMDGEN_COMPILE) $(D_INCLUDES) $<