From patchwork Tue Jan 15 21:13:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1025494 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="uPNGPd/5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fNPD4lTVz9s9G for ; Wed, 16 Jan 2019 08:13:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390247AbfAOVNu (ORCPT ); Tue, 15 Jan 2019 16:13:50 -0500 Received: from mail-yb1-f201.google.com ([209.85.219.201]:38745 "EHLO mail-yb1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730655AbfAOVNu (ORCPT ); Tue, 15 Jan 2019 16:13:50 -0500 Received: by mail-yb1-f201.google.com with SMTP id z16so1963879ybk.5 for ; Tue, 15 Jan 2019 13:13:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=IIlSCknoZA1PE+736XBJVHkA3z5uMWXyOFALugSB9cI=; b=uPNGPd/5+M6BzT1/maLURbywCgYlGUGfHurxkIap6bz2KTzI/4/J6aXu97d1RR0vkY WHmAvMn9IePK+elW79xo1zMQH4q/knJXp2+7mJ5YuxdtYPhiM1QGKo1n5Wt4osTXLBA3 pYBEUCbF78jOPb4rT9X75x77Qjbx/Asj1PYhpzgmEjEmsbXaC+RS6sn0dGCbN3D4g+Nb JnZD1XtWazvf7HkWbYNHIIf4t5mfoGUcjMj3pNQaln/fs6xTCt6JRZ4C6+Jq5QYVqgX4 ZgCIL1Q33wJu4AsnV80+fs082KIomkWYGik/QxjSM8t7AHmu8urIpA1Qp07S6GNEZg2P oH2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=IIlSCknoZA1PE+736XBJVHkA3z5uMWXyOFALugSB9cI=; b=VUmKzNZyyZaxa8fiUJ/FrwxxNlpFbdeVCRgOSgePK3/KJmVX/bV2oGTmISZNZ7QzO4 cqJ70AKle/UGf5+FkcZ89ayABpEt3jCgaxO5dhlmHY4bV//Rwcpaeso4TNsHnSGGvapR Czw4xiSTiFWIpqNn7IP4WQSiX8U+v9BCSvN/S+1uopyY8dNz00/vgp9TVkFxuhaXvCNV dYEAZZrqmZUimIIG7myKkWND/VQBeROLCIOfOp/Db9gYhnJLjOCrQ4WzQ1MQdvaNmBsH prinIwCdVmu5uyekCGa6c6VTV/p9DOoL6jSlM0SZHEHIEPVAqtDO7Ec5J32j+fJoW9bQ 7AdA== X-Gm-Message-State: AJcUukdQIRGhNkv2SSJ8gk87Ec5L7r5eWvtFoueNO1MNzQOvuYgEAI08 b5kB0qjv/JKXJbR1TT5hRtsghyriBs4eNAgW8xFTc9DbAHe0TdL69lsRGd2ioF53Q0m9RCDy8Fj SiWb+vZDth5Fgh3IMIn+ud7V2iWh3qpbiUVOAOWlB58Ss2LmenRbglg== X-Google-Smtp-Source: ALg8bN4O5w3JpZnR+DydPBvnrpvTv1bNErQt6zfq+cvYrqUDL55yl5NoO8u0zpTUAuWv9Z2+sefFvbU= X-Received: by 2002:a25:2ac5:: with SMTP id q188mr2519061ybq.80.1547586829704; Tue, 15 Jan 2019 13:13:49 -0800 (PST) Date: Tue, 15 Jan 2019 13:13:46 -0800 Message-Id: <20190115211346.27450-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog Subject: [PATCH bpf-next] libbpf: don't define CC and AR From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We are already including tools/scripts/Makefile.include which correctly handles CROSS_COMPILE, no need to define our own vars. See related commit 7ed1c1901fe5 ("tools: fix cross-compile var clobbering") for more details. Signed-off-by: Stanislav Fomichev --- tools/lib/bpf/Makefile | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 34d9c3619c96..847916273696 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -14,21 +14,6 @@ srctree := $(patsubst %/,%,$(dir $(srctree))) #$(info Determined 'srctree' to be $(srctree)) endif -# Makefiles suck: This macro sets a default value of $(2) for the -# variable named by $(1), unless the variable has been set by -# environment or command line. This is necessary for CC and AR -# because make sets default values, so the simpler ?= approach -# won't work as expected. -define allow-override - $(if $(or $(findstring environment,$(origin $(1))),\ - $(findstring command line,$(origin $(1)))),,\ - $(eval $(1) = $(2))) -endef - -# Allow setting CC and AR, or setting CROSS_COMPILE as a prefix. -$(call allow-override,CC,$(CROSS_COMPILE)gcc) -$(call allow-override,AR,$(CROSS_COMPILE)ar) - INSTALL = install # Use DESTDIR for installing into a different root directory. @@ -54,7 +39,7 @@ man_dir_SQ = '$(subst ','\'',$(man_dir))' export man_dir man_dir_SQ INSTALL export DESTDIR DESTDIR_SQ -include ../../scripts/Makefile.include +include $(srctree)/tools/scripts/Makefile.include # copy a bit from Linux kbuild