From: "Paul E. McKenney" <[email protected]>
To: [email protected]
Cc: [email protected], [email protected],
[email protected], [email protected],
Willy Tarreau <[email protected]>,
"Paul E . McKenney" <[email protected]>
Subject: [PATCH rcu 3/5] tools/nolibc: fix the makefile to also work as "make -C tools ..."
Date: Mon, 20 Jun 2022 16:13:26 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <20220620231325.GA3845036@paulmck-ThinkPad-P17-Gen-1>
From: Willy Tarreau <[email protected]>
As reported by Linus, the nolibc's makefile is currently broken when
invoked as per the documented method (make -C tools nolibc_<target>),
because it now relies on the ARCH and OUTPUT variables that are not
set in this case.
This patch addresses this by sourcing subarch.include, and by
presetting OUTPUT to the current directory if not set. This is
sufficient to make the commands work both as a standalone target
and as a tools/ sub-target.
Signed-off-by: Willy Tarreau <[email protected]>
Signed-off-by: Paul E. McKenney <[email protected]>
---
tools/include/nolibc/Makefile | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index 7a16d917c1859..e8bac6ef36538 100644
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -7,6 +7,22 @@ ifeq ($(srctree),)
srctree := $(patsubst %/tools/include/,%,$(dir $(CURDIR)))
endif
+# when run as make -C tools/ nolibc_<foo> the arch is not set
+ifeq ($(ARCH),)
+include $(srctree)/scripts/subarch.include
+ARCH = $(SUBARCH)
+endif
+
+# OUTPUT is only set when run from the main makefile, otherwise
+# it defaults to this nolibc directory.
+OUTPUT ?= $(CURDIR)/
+
+ifeq ($(V),1)
+Q=
+else
+Q=@
+endif
+
nolibc_arch := $(patsubst arm64,aarch64,$(ARCH))
arch_file := arch-$(nolibc_arch).h
all_files := ctype.h errno.h nolibc.h signal.h std.h stdio.h stdlib.h string.h \
@@ -36,7 +52,7 @@ headers:
headers_standalone: headers
$(Q)$(MAKE) -C $(srctree) headers
- $(Q)$(MAKE) -C $(srctree) headers_install INSTALL_HDR_PATH=$(OUTPUT)/sysroot
+ $(Q)$(MAKE) -C $(srctree) headers_install INSTALL_HDR_PATH=$(OUTPUT)sysroot
clean:
$(call QUIET_CLEAN, nolibc) rm -rf "$(OUTPUT)sysroot"
--
2.31.1.189.g2e36527f23
next prev parent reply other threads:[~2022-06-20 23:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 23:13 [PATCH rcu 0/5] nolibc updates for v5.20 Paul E. McKenney
2022-06-20 23:13 ` [PATCH rcu 1/5] tools/nolibc/stdlib: Support overflow checking for older compiler versions Paul E. McKenney
2022-06-20 23:13 ` [PATCH rcu 2/5] tools/nolibc/stdio: Add format attribute to enable printf warnings Paul E. McKenney
2022-06-20 23:13 ` Paul E. McKenney [this message]
2022-06-20 23:13 ` [PATCH rcu 4/5] tools/nolibc: make the default target build the headers Paul E. McKenney
2022-06-20 23:13 ` [PATCH rcu 5/5] tools/nolibc: add a help target to list supported targets Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox