From: Nick Desaulniers <nick.desaulniers@gmail.com>
To: Masahiro Yamada <masahiroy@kernel.org>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
Nick Desaulniers <nick.desaulniers@gmail.com>,
Huacai Chen <chenhuacai@kernel.org>, WANG Xuerui <git@xen0n.name>,
Guo Ren <guoren@kernel.org>,
linux-kernel@vger.kernel.org
Cc: rust-for-linux@vger.kernel.org, asahi@lists.linux.dev,
linux-kbuild@vger.kernel.org
Subject: [PATCH] scripts: subarch.include: fix SUBARCH on MacOS hosts
Date: Sun, 13 Nov 2022 15:38:09 -0800 [thread overview]
Message-ID: <20221113233812.36784-1-nick.desaulniers@gmail.com> (raw)
When building the Linux kernel on an aarch64 MacOS based host, if we don't
specify a value for ARCH when invoking make, we default to arm and thus
multi_v7_defconfig rather than the expected arm64 and arm64's defconfig.
This is because subarch.include invokes `uname -m` which on MacOS hosts
evaluates to `arm64` but on Linux hosts evaluates to `aarch64`,
This allows us to build ARCH=arm64 natively on MacOS (as in ARCH need
not be specified on an aarch64-based system).
Utilize a negative lookahead regular expression to avoid matching arm64.
Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com>
---
This is only part 1 of
https://github.com/ClangBuiltLinux/linux/commit/f06333e29addbc3d714adb340355f471c1dfe95a
I'm still working on the rest...
scripts/subarch.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/subarch.include b/scripts/subarch.include
index 4bd327d0ae42..aa130286b627 100644
--- a/scripts/subarch.include
+++ b/scripts/subarch.include
@@ -6,7 +6,7 @@
SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
-e s/sun4u/sparc64/ \
- -e s/arm.*/arm/ -e s/sa110/arm/ \
+ -e s/arm\(?:\(?!64\).*\)/arm/ -e s/sa110/arm/ \
-e s/s390x/s390/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
--
2.37.0 (Apple Git-136)
next reply other threads:[~2022-11-13 23:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-13 23:38 Nick Desaulniers [this message]
2022-11-15 4:12 ` [PATCH] scripts: subarch.include: fix SUBARCH on MacOS hosts Nicolas Schier
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 \
--in-reply-to=20221113233812.36784-1-nick.desaulniers@gmail.com \
--to=nick.desaulniers@gmail.com \
--cc=asahi@lists.linux.dev \
--cc=chenhuacai@kernel.org \
--cc=git@xen0n.name \
--cc=guoren@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).