* [PATCH bpf-next] libbpf: don't define CC and AR
@ 2019-01-15 21:13 Stanislav Fomichev
2019-01-16 22:00 ` Daniel Borkmann
0 siblings, 1 reply; 2+ messages in thread
From: Stanislav Fomichev @ 2019-01-15 21:13 UTC (permalink / raw)
To: netdev; +Cc: davem, ast, daniel, Stanislav Fomichev
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 <sdf@google.com>
---
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
--
2.20.1.97.g81188d93c3-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH bpf-next] libbpf: don't define CC and AR
2019-01-15 21:13 [PATCH bpf-next] libbpf: don't define CC and AR Stanislav Fomichev
@ 2019-01-16 22:00 ` Daniel Borkmann
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Borkmann @ 2019-01-16 22:00 UTC (permalink / raw)
To: Stanislav Fomichev, netdev; +Cc: davem, ast
On 01/15/2019 10:13 PM, Stanislav Fomichev wrote:
> 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 <sdf@google.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-16 22:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-15 21:13 [PATCH bpf-next] libbpf: don't define CC and AR Stanislav Fomichev
2019-01-16 22:00 ` Daniel Borkmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).