gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-05 17:27:07 -08:00
Code Issues Projects Releases Wiki Activity

sys-libs/glibc: fix glibc-headers bootstrap on non-multilib host

Browse Source 
The error is found by wm_ attempting to build a cross-compiler
    CHOST=powerpc-unknown-linux-gnu CTARGET=mips64-unknown-linux-gnu
Boostrap failed on glibc-headers (./configure phase) as:

  configure:2623: powerpc-unknown-linux-gnu-gcc -mabi=n32 -c \
      -O1 -pipe -U_FORTIFY_SOURCE conftest.c >&5
  powerpc-unknown-linux-gnu-gcc: error: \
      unrecognized command line option '-mabi=n32'; did you mean '-mabi=d32'?

Note how target's ABI is mexed into host's compiler flags.

The error above happens on every host=non-multilib target=multilib combination.
I've reproduced it on:
    CHOST=i686-pc-linux-gnu CTARGET=mips64-unknown-linux-gnu

The fix is not to inject target's CFLAGS ABI into CC for
USE=headers-only bootstrap step as we don't have cross-compiler yet.

Tested by successfully bootstrapping cross-compiler on
    CHOST=i686-pc-linux-gnu CTARGET=mips64-unknown-linux-gnu

Package-Manager: Portage-2.3.26, Repoman-2.3.7
This commit is contained in:
Sergei Trofimovich
2018-03-30 12:43:08 +01:00
parent 1b31083fd1
commit bdb069df28
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys-libs/glibc/glibc-2.27-r1.ebuild
+7
View File
@@ -457,6 +457,13 @@ setup_env() {
export ABI=${ABI:-${DEFAULT_ABI:-default}}
if use headers-only ; then
# Avoid mixing host's CC and target's CFLAGS_${ABI}:
# At this bootstrap stage we have only binutils for
# target but not compiler yet.
einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
return 0
fi
local VAR=CFLAGS_${ABI}
# We need to export CFLAGS with abi information in them because glibc's
# configure script checks CFLAGS for some targets (like mips). Keep
sys-libs/glibc/glibc-9999.ebuild
+7
View File
@@ -457,6 +457,13 @@ setup_env() {
export ABI=${ABI:-${DEFAULT_ABI:-default}}
if use headers-only ; then
# Avoid mixing host's CC and target's CFLAGS_${ABI}:
# At this bootstrap stage we have only binutils for
# target but not compiler yet.
einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
return 0
fi
local VAR=CFLAGS_${ABI}
# We need to export CFLAGS with abi information in them because glibc's
# configure script checks CFLAGS for some targets (like mips). Keep