From patchwork Fri Nov 23 04:51:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10695041 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D2A0F15A7 for ; Fri, 23 Nov 2018 04:52:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1BD62C917 for ; Fri, 23 Nov 2018 04:52:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B49152C91D; Fri, 23 Nov 2018 04:52:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id C4E4F2C917 for ; Fri, 23 Nov 2018 04:52:23 +0000 (UTC) Received: (qmail 1552 invoked by uid 550); 23 Nov 2018 04:52:21 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 1511 invoked from network); 23 Nov 2018 04:52:20 -0000 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com wAN4pTNN020182 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1542948690; bh=aM+gs7PxzxzFrVNFpMVUiiP1VJPNQgasYQmq9JMtCZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rw30CJTFv99+lViRfCG0ocwdgtzNxGnGp8/vroShy90ESFV1aC1PbJJ4b3SVAw2Zl RdDJg7YVOF+TefhDlP1c1GEGpvO+V/Q7bua6eqfTE1H4xllbQPv1KlySExqGut2N4p o2tzYC4b7Bc5nIPdM8regrT0FfGmOE+DpchSymnBGc1Uh+Y7UO7aL026s29jIVjKGM lj754hl5yV1bwbWlQ63N9ClUPnCzO/n51gHIHggTQVrqAaOwjO2TGrWHl1sr0YDFQk DkIr9KUGzamPza0T1bzYBECgH0RO0hFafUY8pe0erkv1GrKzJG7CDejJhsst5ZRNbB MagAlnZ4mxEjA== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , kernel-hardening@lists.openwall.com, Kees Cook , linux-kernel@vger.kernel.org, Michal Marek , Emese Revfy Subject: [PATCH 2/2] kbuild: descend into scripts/gcc-plugins/ via scripts/Makefile Date: Fri, 23 Nov 2018 13:51:27 +0900 Message-Id: <1542948687-7326-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542948687-7326-1-git-send-email-yamada.masahiro@socionext.com> References: <1542948687-7326-1-git-send-email-yamada.masahiro@socionext.com> X-Virus-Scanned: ClamAV using ClamSMTP Now that 'prepare0' depends on 'scripts', building GCC plugins can go into scripts/Makefile, which is a more standard way. Signed-off-by: Masahiro Yamada Reviewed-by: Kees Cook --- Makefile | 2 +- scripts/Makefile | 3 ++- scripts/Makefile.gcc-plugins | 8 -------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index cee4cec..a8bbe68 100644 --- a/Makefile +++ b/Makefile @@ -1114,7 +1114,7 @@ macroprepare: prepare1 archmacros archprepare: archheaders archscripts macroprepare scripts_basic -prepare0: scripts archprepare gcc-plugins +prepare0: scripts archprepare $(Q)$(MAKE) $(build)=scripts/mod $(Q)$(MAKE) $(build)=. diff --git a/scripts/Makefile b/scripts/Makefile index b48259d..feb1f71 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -36,9 +36,10 @@ PHONY += build_unifdef build_unifdef: $(obj)/unifdef @: +subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins subdir-$(CONFIG_MODVERSIONS) += genksyms subdir-$(CONFIG_SECURITY_SELINUX) += selinux subdir-$(CONFIG_GDB_SCRIPTS) += gdb # Let clean descend into subdirs -subdir- += basic dtc kconfig mod package gcc-plugins +subdir- += basic dtc kconfig mod package diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins index 46c5c68..c36f199 100644 --- a/scripts/Makefile.gcc-plugins +++ b/scripts/Makefile.gcc-plugins @@ -49,11 +49,3 @@ KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS) # All enabled GCC plugins are collected here for building below. GCC_PLUGIN := $(gcc-plugin-y) export GCC_PLUGIN - -# Actually do the build, if requested. -PHONY += gcc-plugins -gcc-plugins: scripts_basic -ifdef CONFIG_GCC_PLUGINS - $(Q)$(MAKE) $(build)=scripts/gcc-plugins -endif - @: