| 1 |
commit: 1618cd3e114309e62d10e5f6cbf468a3e91b8985 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 4 10:47:29 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 4 10:47:29 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=1618cd3e |
| 7 |
|
| 8 |
travis: ensure we keep env-set CPPFLAGS/LDFLAGS |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
travis/main.sh | 4 ++-- |
| 13 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/travis/main.sh b/travis/main.sh |
| 16 |
index 6313d1b..2c1670c 100755 |
| 17 |
--- a/travis/main.sh |
| 18 |
+++ b/travis/main.sh |
| 19 |
@@ -3,8 +3,8 @@ |
| 20 |
. "${0%/*}"/lib.sh |
| 21 |
|
| 22 |
# For local deps like blake2b. |
| 23 |
-export CPPFLAGS="-I${PWD}/../sysroot" |
| 24 |
-export LDFLAGS="-L${PWD}/../sysroot" |
| 25 |
+export CPPFLAGS="${CPPFLAGS} -I${PWD}/../sysroot" |
| 26 |
+export LDFLAGS="${LDFLAGS} -L${PWD}/../sysroot" |
| 27 |
|
| 28 |
# ignore timestamps which git doesn't preserve |
| 29 |
# disable openmp because Clang's libomp isn't installed |
Archives