From patchwork Mon Sep 16 10:54:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 173832 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp3338203ilq; Mon, 16 Sep 2019 03:55:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqxs5/7WZsSQtxQYBTp/3vn1dIeVNWdGO7h2aRPt6JCjBgShzW+bnGmDIAtX9BugLPab9yzx X-Received: by 2002:a17:906:4cca:: with SMTP id q10mr19477040ejt.236.1568631327625; Mon, 16 Sep 2019 03:55:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568631327; cv=none; d=google.com; s=arc-20160816; b=qU/67NJjLjL74JZnLQAWw4vVhP9ulrRq7pUWvVoDfDiQb1Gdl5xN9sk0hBcXexhv0v ce8OIGHLxmpvAOrI25uvwhGgaLUcgpIw3eJrC4YRInnYE0gxFFEfhT6E9N1sCn8xbT9u k9QXOf6eEoLBl81Z0bdlEdAzHax9JT/F3J53ayz6hFd69Q5jsRXBszugLMNqFopMKlzJ Ws+GM2YgHBUW/4RoKyP8KjWj8LsPNs55UQ1lT0z1olDlTn2tPaaF6kmRTVFRq5BtSTkl GOnOCnr/RTIEpqN3Z1U5lHZeZFaSUKgQH2PeGC3ZDhpYaGjHzcEbD64jAU55rnHktbaF 6Aeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=MLJcNNJZkagwGK0zIyaqmigCmuc2QO9sJ0CkQCG94a8=; b=Dit2vlqzdQsenms8D1S/4A2TGKXm3Iah+azCTxgzXuM0/T4M0BHhFKwQ43Ki4QHQvM Ipu6uwanuCyKvdyS2P0QW0OgQiuPD39LtU5Ca8iwK7cuz4xyQSROiXFxAIsVpLKq5mv/ hieZKYlJ4HfpZ9O3R8+qL5rOmQ4GHdPu3Cmx2fU/PtpHdCehajT99ErGxqXLd5B3VojX QVXxpfMLb3anIOoOlN/8Ge9LxPqTMxoqQaXbQjBJSberaifDksNgwsjdUrYnCbu9L7Si va8xraVs9EHfJDB8H241qUpw2RoEuMeqrgyyHfczmVpbDbmoMEwyN8BO8AHdbVnUfXSW fvgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E9WHFu0T; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m6si20600239edv.288.2019.09.16.03.55.27; Mon, 16 Sep 2019 03:55:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E9WHFu0T; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732656AbfIPKzY (ORCPT + 27 others); Mon, 16 Sep 2019 06:55:24 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:33541 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732547AbfIPKy4 (ORCPT ); Mon, 16 Sep 2019 06:54:56 -0400 Received: by mail-lj1-f196.google.com with SMTP id a22so33277842ljd.0 for ; Mon, 16 Sep 2019 03:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MLJcNNJZkagwGK0zIyaqmigCmuc2QO9sJ0CkQCG94a8=; b=E9WHFu0TVM9YPIg7e9FZQRJiw7GUUX46qDnJ7XJhp3tzqNkGIEkdZ/VfJkd5CiXCIu soL1+mGe5drovecAMdpE93IRIhgR5mqv5Inm7FMZtz3sR+ufpAD/Vj+CYguj9jaX979F eFqpi/6RF90/XKCxiwnqHbTubyY2+/Q2q7UmsEzAUVdYX0iubLOvOOMtNb6rLhLftlI8 LGDNDWirLx7qPTGiEj+xYJs+l+TAonQmkRLwyJcjWSOCrpnM1a9qakwXyDalWaCOcOpj avbgMt/cu6EWydrCF+LYQy6vWHBc6xfHcI6HCINSXEg03CYbhAha+4hat/DwPB08BSH0 IXoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MLJcNNJZkagwGK0zIyaqmigCmuc2QO9sJ0CkQCG94a8=; b=ixgkfsE1g5RJNWxjTltbkwxOr/hsB9566bs0uEt1MHmsEXgTnVIZogiqTnSbExnGvW wB22/PZNbGTI2zXB4P8yp6/iTC4mm99d8g0Y8o+7MQt2xGC+oRRg/v4iFmCLER5Hpt1a 0Cy2QCoHUpJC7zJJODSHFHt5C+fvHCVI0LH0Z6oN5Bm0VV6RhjtR6iFZ7lIXptabBklC vuoPhz6uX0Aw3/JsnmZra/I11xeLmqRr2cTIHUt6SZZY8m7uDC6dpcGAbOH6mkEu7Dsi 6UVw4Ze0j9NPAUArO5B858buyjR1+fB9oX1VDK18hyGD2YK4p4+0mRpRZpT/7sJMQ/vs 1M7w== X-Gm-Message-State: APjAAAU/khHl0nLWuGTcCg7Xqy+jYcAP0byAizMHOhIVADChJBVmBg7/ LjgqWLCszfKikdEdL5L+CiU6WA== X-Received: by 2002:a2e:9f17:: with SMTP id u23mr2122827ljk.241.1568631294682; Mon, 16 Sep 2019 03:54:54 -0700 (PDT) Received: from localhost.localdomain (168-200-94-178.pool.ukrtel.net. [178.94.200.168]) by smtp.gmail.com with ESMTPSA id v1sm8987737lfq.89.2019.09.16.03.54.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2019 03:54:54 -0700 (PDT) From: Ivan Khoronzhuk To: ast@kernel.org, daniel@iogearbox.net, yhs@fb.com, davem@davemloft.net, jakub.kicinski@netronome.com, hawk@kernel.org, john.fastabend@gmail.com Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, clang-built-linux@googlegroups.com, sergei.shtylyov@cogentembedded.com, Ivan Khoronzhuk Subject: [PATCH v3 bpf-next 11/14] libbpf: makefile: add C/CXX/LDFLAGS to libbpf.so and test_libpf targets Date: Mon, 16 Sep 2019 13:54:30 +0300 Message-Id: <20190916105433.11404-12-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190916105433.11404-1-ivan.khoronzhuk@linaro.org> References: <20190916105433.11404-1-ivan.khoronzhuk@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In case of LDFLAGS and EXTRA_CC/CXX flags there is no way to pass them correctly to build command, for instance when --sysroot is used or external libraries are used, like -lelf, wich can be absent in toolchain. This can be used for samples/bpf cross-compiling allowing to get elf lib from sysroot. Signed-off-by: Ivan Khoronzhuk --- tools/lib/bpf/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index c6f94cffe06e..bccfa556ef4e 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -94,6 +94,10 @@ else CFLAGS := -g -Wall endif +ifdef EXTRA_CXXFLAGS + CXXFLAGS := $(EXTRA_CXXFLAGS) +endif + ifeq ($(feature-libelf-mmap), 1) override CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT endif @@ -176,8 +180,9 @@ $(BPF_IN): force elfdep bpfdep $(OUTPUT)libbpf.so: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION) $(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN) - $(QUIET_LINK)$(CC) --shared -Wl,-soname,libbpf.so.$(LIBBPF_MAJOR_VERSION) \ - -Wl,--version-script=$(VERSION_SCRIPT) $^ -lelf -o $@ + $(QUIET_LINK)$(CC) $(LDFLAGS) \ + --shared -Wl,-soname,libbpf.so.$(LIBBPF_MAJOR_VERSION) \ + -Wl,--version-script=$(VERSION_SCRIPT) $^ -lelf -o $@ @ln -sf $(@F) $(OUTPUT)libbpf.so @ln -sf $(@F) $(OUTPUT)libbpf.so.$(LIBBPF_MAJOR_VERSION) @@ -185,7 +190,7 @@ $(OUTPUT)libbpf.a: $(BPF_IN) $(QUIET_LINK)$(RM) $@; $(AR) rcs $@ $^ $(OUTPUT)test_libbpf: test_libbpf.cpp $(OUTPUT)libbpf.a - $(QUIET_LINK)$(CXX) $(INCLUDES) $^ -lelf -o $@ + $(QUIET_LINK)$(CXX) $(CXXFLAGS) $(LDFLAGS) $(INCLUDES) $^ -lelf -o $@ $(OUTPUT)libbpf.pc: $(QUIET_GEN)sed -e "s|@PREFIX@|$(prefix)|" \