From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Randy Dunlap <rdunlap@infradead•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Kbuild mailing list <linux-kbuild@vger•kernel.org>,
"linux-um@lists•infradead.org" <linux-um@lists•infradead.org>,
Miguel Ojeda <miguel.ojeda.sandonis@gmail•com>,
Alex Gaynor <alex.gaynor@gmail•com>,
Geoffrey Thomas <geofft@ldpreload•com>,
Finn Behrens <me@kloenk•de>,
Adam Bratschi-Kaye <ark.email@gmail•com>,
Wedson Almeida Filho <wedsonaf@google•com>,
Boqun Feng <boqun.feng@gmail•com>,
Sumera Priyadarsini <sylphrenadin@gmail•com>,
Michael Ellerman <mpe@ellerman•id.au>,
Sven Van Asbroeck <thesven73@gmail•com>,
Gary Guo <gary@garyguo•net>,
Boris-Chengbiao Zhou <bobo1239@web•de>,
Fox Chen <foxhlchen@gmail•com>,
Ayaan Zaidi <zaidi.ayaan@gmail•com>,
Douglas Su <d0u9.su@outlook•com>, Yuki Okushi <jtitor@2k36•org>
Subject: Re: linux-next: Tree for Oct 18 ('make' error on ARCH=um)
Date: Tue, 19 Oct 2021 08:58:11 +1100 [thread overview]
Message-ID: <20211019085811.362b4304@canb.auug.org.au> (raw)
In-Reply-To: <a1b2bdda-d1cf-807b-6a84-73a3e347639c@infradead.org>
[-- Attachment #1: Type: text/plain, Size: 2774 bytes --]
Hi all,
On Mon, 18 Oct 2021 14:14:59 -0700 Randy Dunlap <rdunlap@infradead•org> wrote:
>
> On 10/18/21 2:30 AM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20211015:
> >
>
> UML (arch=um) with SUBARCH of i386 or x86_64,
> using gcc, not clang:
>
> make[1]: Entering directory '/work/lnx/next/linux-next-20211018/UM64'
> ../scripts/Makefile.clang:19: *** Specify CROSS_COMPILE or add '--target=' option to scripts/Makefile.clang. Stop.
> make[1]: Leaving directory '/work/lnx/next/linux-next-20211018/UM64'
> make: *** [Makefile:226: __sub-make] Error 2
>
>
> Just use a make target of defconfig:
>
> make ARCH=um SUBARCH=x86_64 O=UM64 defconfig
OK, I missed that.
In commit
c862c7fee526 ("Kbuild: add Rust support")
from the rust tree, these bits should probably not be there:
Makefile:
@@ -586,13 +628,11 @@ endif
# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
# CC_VERSION_TEXT is referenced from Kconfig (so it needs export),
# and from include/config/auto.conf.cmd to detect the compiler upgrade.
CC_VERSION_TEXT = $(subst $(pound),,$(shell LC_ALL=C $(CC) --version 2>/dev/null | head -n 1))
-ifneq ($(findstring clang,$(CC_VERSION_TEXT)),)
include $(srctree)/scripts/Makefile.clang
-endif
# Include this also for config targets because some architectures need
# cc-cross-prefix to determine CROSS_COMPILE.
ifdef need-compiler
include $(srctree)/scripts/Makefile.compiler
in scripts/Makefile.clang the
ifneq ($(findstring clang,$(CC_VERSION_TEXT)),)
endif
pair near the end become unnecessary.
So I will apply the following to the merge of the rust tree today:
diff --git a/Makefile b/Makefile
index b4482fd3a0cc..3d7c777d831f 100644
--- a/Makefile
+++ b/Makefile
@@ -630,7 +630,9 @@ endif
# and from include/config/auto.conf.cmd to detect the compiler upgrade.
CC_VERSION_TEXT = $(subst $(pound),,$(shell LC_ALL=C $(CC) --version 2>/dev/null | head -n 1))
+ifneq ($(findstring clang,$(CC_VERSION_TEXT)),)
include $(srctree)/scripts/Makefile.clang
+endif
# Include this also for config targets because some architectures need
# cc-cross-prefix to determine CROSS_COMPILE.
diff --git a/scripts/Makefile.clang b/scripts/Makefile.clang
index 38f555d0cb0d..b8e331f98471 100644
--- a/scripts/Makefile.clang
+++ b/scripts/Makefile.clang
@@ -40,9 +40,7 @@ TENTATIVE_CLANG_FLAGS += -Werror=ignored-optimization-argument
export TENTATIVE_CLANG_FLAGS
-ifneq ($(findstring clang,$(CC_VERSION_TEXT)),)
CLANG_FLAGS += $(TENTATIVE_CLANG_FLAGS)
KBUILD_CFLAGS += $(CLANG_FLAGS)
KBUILD_AFLAGS += $(CLANG_FLAGS)
export CLANG_FLAGS
-endif
Miguel, does that seem reasonable?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-10-18 21:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 9:30 linux-next: Tree for Oct 18 Stephen Rothwell
2021-10-18 21:14 ` linux-next: Tree for Oct 18 ('make' error on ARCH=um) Randy Dunlap
2021-10-18 21:58 ` Stephen Rothwell [this message]
2021-10-18 22:18 ` Miguel Ojeda
2021-10-20 4:56 ` Stephen Rothwell
2021-10-20 14:23 ` Randy Dunlap
2021-10-20 14:46 ` Randy Dunlap
2021-10-20 14:48 ` Miguel Ojeda
2021-10-20 20:59 ` Stephen Rothwell
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=20211019085811.362b4304@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alex.gaynor@gmail$(echo .)com \
--cc=ark.email@gmail$(echo .)com \
--cc=bobo1239@web$(echo .)de \
--cc=boqun.feng@gmail$(echo .)com \
--cc=d0u9.su@outlook$(echo .)com \
--cc=foxhlchen@gmail$(echo .)com \
--cc=gary@garyguo$(echo .)net \
--cc=geofft@ldpreload$(echo .)com \
--cc=jtitor@2k36$(echo .)org \
--cc=linux-kbuild@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=me@kloenk$(echo .)de \
--cc=miguel.ojeda.sandonis@gmail$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=rdunlap@infradead$(echo .)org \
--cc=sylphrenadin@gmail$(echo .)com \
--cc=thesven73@gmail$(echo .)com \
--cc=wedsonaf@google$(echo .)com \
--cc=zaidi.ayaan@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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