diff options
author | Palmer Dabbelt <palmer@rivosinc.com> | 2021-12-20 17:19:56 -0800 |
---|---|---|
committer | Palmer Dabbelt <palmer@rivosinc.com> | 2021-12-20 17:31:27 -0800 |
commit | 4ce4d457a62f10674109f101b0a0a547b8c99e87 (patch) | |
tree | a98a9f8b4994649327e93f940bc6abcd12c43f6b /Makefile.in | |
parent | b39e36160aa0649ba0dfb9aa314d375900d610fb (diff) | |
download | riscv-gnu-toolchain-4ce4d457a62f10674109f101b0a0a547b8c99e87.zip riscv-gnu-toolchain-4ce4d457a62f10674109f101b0a0a547b8c99e87.tar.gz riscv-gnu-toolchain-4ce4d457a62f10674109f101b0a0a547b8c99e87.tar.bz2 |
Set CXX to a nonexistent compiler when building glibc
We set CXX=riscv64-unknown-linux-gnu-g++ (or something like that) when
building glibc, but don't actually build a C++ compiler during stage 1.
Under normal conditions this shouldn't cause any issues: that's either a
working compiler (from PATH) or doesn't exist, in which case glibc's
build scripts do the right thing and turn off C++. Unfortunately I'm in
the pathological situation of having a slightly-incompatible g++ in
PATH, which glibc then attempts to use only to throw an error when
linking (glibc isn't testing that much of the C++ toolchain, see
<https://sourceware.org/bugzilla/show_bug.cgi?id=24183>).
This simply sets CXX to something that's unlikely to exist during the
glibc build, so the build scripts don't get confused. I tried setting
this to false, but everything was italic.
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 38e3a78..685a7c5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -327,7 +327,7 @@ endif mkdir $(notdir $@) cd $(notdir $@) && \ CC="$(GLIBC_CC_FOR_TARGET) $($@_CFLAGS)" \ - CXX="$(GLIBC_CXX_FOR_TARGET) $($@_CFLAGS)" \ + CXX="this-is-not-the-compiler-youre-looking-for" \ CFLAGS="$(CFLAGS_FOR_TARGET) -g -O2 $($@_CFLAGS)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET) -g -O2 $($@_CFLAGS)" \ ASFLAGS="$(ASFLAGS_FOR_TARGET) $($@_CFLAGS)" \ |