aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2017-12-30 17:37:00 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2017-12-30 17:37:00 +0000
commit599c41fb4d25d18cd6571cb2a6c793906682c259 (patch)
tree5295e64f067ace7b4962d4f3a9563658990c2749
parentcrossdev: allow set_eopts_on_pkg_status() to accept multiple USE flags (diff)
downloadcrossdev-599c41fb4d25d18cd6571cb2a6c793906682c259.tar.gz
crossdev-599c41fb4d25d18cd6571cb2a6c793906682c259.tar.bz2
crossdev-599c41fb4d25d18cd6571cb2a6c793906682c259.zip
crossdev: prepare for CROSSCOMPILE_OPTS=headers-only -> USE=headers-only transition
Crossdev will provide both CROSSCOMPILE_OPTS=headers-only USE=headers-only to early toolchain bootstrap stage while ::gentoo is not completely migrated off CROSSCOMPILE_OPTS=headers-only The longer-term plan is to get rid of 'CROSSCOMPILE_OPTS=' completely. Reported-by: Michał Górny Bug: https://bugs.gentoo.org/642712 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rwxr-xr-xcrossdev8
1 files changed, 4 insertions, 4 deletions
diff --git a/crossdev b/crossdev
index d546dbe..fd9f598 100755
--- a/crossdev
+++ b/crossdev
@@ -1312,7 +1312,7 @@ if ! ex_fast ; then
# first install headers if requested
if with_headers ; then
# install kernel headers (since the C library often uses them)
- USE="${KUSE} ${USE}" \
+ USE="${KUSE} ${USE} headers-only" \
CROSSCOMPILE_OPTS="headers-only" \
doemerge ${KPKG} ${KPKG}-quick
@@ -1321,7 +1321,7 @@ if ! ex_fast ; then
# we have to use --nodeps as glibc itself might have
# a dependency on newer gcc versions that we don't
# care about at this point -- we aren't compiling yet
- USE="${LUSE} ${USE}" \
+ USE="${LUSE} ${USE} headers-only" \
CROSSCOMPILE_OPTS="headers-only" \
EOPTS="${EOPTS} --nodeps" \
doemerge ${LPKG} ${LPKG}-headers
@@ -1336,7 +1336,7 @@ if ! ex_fast ; then
# stage2: kernel headers
if is_s2 ; then
- set_eopts_on_pkg_status ${KPKG} crosscompile_opts_headers-only
+ set_eopts_on_pkg_status ${KPKG} crosscompile_opts_headers-only headers-only
USE="${KUSE} ${USE}" \
CROSSCOMPILE_OPTS="" \
@@ -1347,7 +1347,7 @@ if ! ex_fast ; then
if is_s3 ; then
[[ -z ${LPKG} ]] && die "Invalid target '${CTARGET}': unknown libc"
- set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only
+ set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only headers-only
USE="${LUSE} ${USE}" \
CROSSCOMPILE_OPTS="" \