From patchwork Tue Apr 10 15:44:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 37803 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 222C81B701; Tue, 10 Apr 2018 17:56:39 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id BCE391B65E for ; Tue, 10 Apr 2018 17:56:37 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Apr 2018 08:50:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,432,1517904000"; d="scan'208";a="31620300" Received: from silpixa00397898.ir.intel.com (HELO silpixa00397898.ger.corp.intel.com) ([10.237.222.184]) by fmsmga008.fm.intel.com with ESMTP; 10 Apr 2018 08:49:59 -0700 From: David Hunt To: dev@dpdk.org Cc: thomas@monjalon.net, anatoly.burakov@intel.com, David Hunt Date: Tue, 10 Apr 2018 16:44:40 +0100 Message-Id: <20180410154440.9723-1-david.hunt@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180410150804.8774-1-david.hunt@intel.com> References: <20180410150804.8774-1-david.hunt@intel.com> Subject: [dpdk-dev] [PATCH v2] mk: fix make defconfig on FreeBSD X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On FreeBSD, make defconfig generates the config as "defconfig_x86_64-bsdapp-", which does not resolve to any known config file. This fix starts by introducing a 'compiler' variable which is set by executing "${CC} --version" and pulling out the name of the compiler. On FreeBDS, we get amd64 out of "uname -m", which was not handled by the list of checks, but which now resolves to x86_64-native The remaining code in the patch then takes ${compiler}, the "uname -m" output and assembles them all together into a valid freebsd config name, i.e. "defconfig_x86_64-native-bsdapp-clang" Fixes: bce6c42c4ad5 ("mk: add sensible default target with defconfig") Signed-off-by: David Hunt --- mk/rte.sdkconfig.mk | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk index 0664725ee..7b1684375 100644 --- a/mk/rte.sdkconfig.mk +++ b/mk/rte.sdkconfig.mk @@ -36,6 +36,7 @@ notemplate: @echo "use T=template from the following list:" @$(MAKE) -rR showconfigs | sed 's,^, ,' +compiler:=$(filter clang gcc icc cc,$(shell ${CC} --version)) .PHONY: defconfig defconfig: @@ -47,15 +48,25 @@ defconfig: print "arm-armv7a"} \ else if ($$0 == "ppc64") { \ print "ppc_64-power8"} \ + else if ($$0 == "amd64") { \ + print "x86_64-native"} \ else { \ - printf "%s-native", $$0} }')-$(shell \ + printf "%s-native", $$0} }' \ + )-$(shell \ uname | awk '{ \ if ($$0 == "Linux") { \ print "linuxapp"} \ else { \ - print "bsdapp"} }')-$(shell \ - ${CC} -v 2>&1 | \ - grep " version " | cut -d ' ' -f 1) + print "bsdapp"} }' \ + )-$(shell \ + echo | awk -v compiler=${compiler} \ + '{ \ + if (compiler == "cc") \ + { print "gcc" } \ + else \ + { print compiler } \ + }' \ + ) .PHONY: config ifeq ($(RTE_CONFIG_TEMPLATE),)