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: Mon, 12 Feb 2018 09:45:37
Message-Id: 1518428627.f3dced826b626399ffc626970171b01a122e1fa1.grobian@gentoo
1 commit: f3dced826b626399ffc626970171b01a122e1fa1
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 12 09:43:47 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 12 09:43:47 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f3dced82
7
8 scripts/bootstrap-prefix: avoid sending -rpath onto the linker on Darwin
9
10 During the bootstrap we cannot rely on the linker being new enough to
11 understand -rpath.
12
13 scripts/bootstrap-prefix.sh | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-)
15
16 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
17 index 0b30448fc9..3ef6e06e35 100755
18 --- a/scripts/bootstrap-prefix.sh
19 +++ b/scripts/bootstrap-prefix.sh
20 @@ -1579,7 +1579,9 @@ bootstrap_stage3() {
21 configure_toolchain || return 1
22 export CONFIG_SHELL="${ROOT}"/tmp/bin/bash
23 export CPPFLAGS="-isystem ${ROOT}/usr/include"
24 - export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,-rpath=${ROOT}/usr/$(get_libdir)"
25 + export LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
26 + [[ ${CHOST} == *-darwin* ]] || \
27 + LDFLAGS+=" -Wl,-rpath=${ROOT}/usr/$(get_libdir)"
28 unset CC CXX
29
30 emerge_pkgs() {