Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/
Date: Thu, 23 Jul 2015 03:48:06
Message-Id: 1437623252.70b1b4ec394ab952a5dcf2bbe2c888852e9412b4.vapier@gentoo
1 commit: 70b1b4ec394ab952a5dcf2bbe2c888852e9412b4
2 Author: Joakim Tjernlund <joakim.tjernlund <AT> transmode <DOT> se>
3 AuthorDate: Tue Jul 21 08:11:33 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 23 03:47:32 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=70b1b4ec
7
8 cross-emerge: handle LDFLAGS too
9
10 BUILD_LDFLAGS was missing, add it too.
11
12 Signed-off-by: Joakim Tjernlund <joakim.tjernlund <AT> transmode.se>
13 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
14
15 wrappers/cross-emerge | 5 +++--
16 1 file changed, 3 insertions(+), 2 deletions(-)
17
18 diff --git a/wrappers/cross-emerge b/wrappers/cross-emerge
19 index 0ea38e3..fc6117e 100755
20 --- a/wrappers/cross-emerge
21 +++ b/wrappers/cross-emerge
22 @@ -20,7 +20,7 @@ fi
23
24 # Portage defaults CBUILD to CHOST, so we have to remove CHOST
25 # from the env to get a "good" value for CBUILD
26 -query_vars="CBUILD CFLAGS CXXFLAGS CPPFLAGS"
27 +query_vars="CBUILD CFLAGS CXXFLAGS CPPFLAGS LDFLAGS"
28 clean_vars="${query_vars} CHOST SYSROOT PORTAGE_CONFIGROOT"
29 eval $(env $(printf -- '-u %s ' ${clean_vars}) \
30 portageq envvar -v ${query_vars} | sed s:^:_E_:)
31 @@ -28,7 +28,8 @@ eval $(env $(printf -- '-u %s ' ${clean_vars}) \
32 : ${BUILD_CFLAGS=${_E_CFLAGS}}
33 : ${BUILD_CXXFLAGS=${_E_CXXFLAGS}}
34 : ${BUILD_CPPFLAGS=${_E_CPPFLAGS}}
35 -export CBUILD BUILD_CFLAGS BUILD_CXXFLAGS BUILD_CPPFLAGS
36 +: ${BUILD_LDFLAGS=${_E_LDFLAGS}}
37 +export CBUILD BUILD_CFLAGS BUILD_CXXFLAGS BUILD_CPPFLAGS BUILD_LDFLAGS
38
39 : ${CROSS_CMD:=emerge --root-deps=rdeps}
40 exec ${CROSS_CMD} "$@"