Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Tue, 02 Feb 2016 19:48:40
Message-Id: 1454442189.03e091d4c48537775f2b91b508a76b3b26818bd1.grobian@gentoo
1 commit: 03e091d4c48537775f2b91b508a76b3b26818bd1
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 2 19:43:09 2016 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 2 19:43:09 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=03e091d4
7
8 bootstrap_stage3: ensure we use includes from target prefix
9
10 Because we use a compiler from stage2 (= EPREFIX/tmp) it also has its
11 searchpath setup to look in that prefix. This gives problems when we
12 need libraries/includes from the newly built prefix (like with libiconv)
13 so, temporarily add flags for the target prefix.
14
15 scripts/bootstrap-prefix.sh | 2 ++
16 1 file changed, 2 insertions(+)
17
18 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
19 index 40eaede..8315397 100755
20 --- a/scripts/bootstrap-prefix.sh
21 +++ b/scripts/bootstrap-prefix.sh
22 @@ -1183,6 +1183,8 @@ bootstrap_stage3() {
23
24 configure_toolchain || return 1
25 export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
26 + export CPPFLAGS="-I${ROOT}/usr/include"
27 + export LDFLAGS="-I${ROOT}/usr/lib"
28 unset CC CXX
29
30 emerge_pkgs() {