From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C3916138334 for ; Sat, 4 Jan 2020 10:47:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2425E088D; Sat, 4 Jan 2020 10:47:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D40CBE088D for ; Sat, 4 Jan 2020 10:47:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B25C34DEE5 for ; Sat, 4 Jan 2020 10:47:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDE8D3C for ; Sat, 4 Jan 2020 10:47:35 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1578134849.1618cd3e114309e62d10e5f6cbf468a3e91b8985.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: travis/ X-VCS-Repository: proj/portage-utils X-VCS-Files: travis/main.sh X-VCS-Directories: travis/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 1618cd3e114309e62d10e5f6cbf468a3e91b8985 X-VCS-Branch: master Date: Sat, 4 Jan 2020 10:47:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7747716c-36d0-4929-86f2-bba35e76871e X-Archives-Hash: 506f4f0952ef8c1ffa54c9847ad11c59 commit: 1618cd3e114309e62d10e5f6cbf468a3e91b8985 Author: Fabian Groffen gentoo org> AuthorDate: Sat Jan 4 10:47:29 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Jan 4 10:47:29 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=1618cd3e travis: ensure we keep env-set CPPFLAGS/LDFLAGS Signed-off-by: Fabian Groffen gentoo.org> travis/main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/main.sh b/travis/main.sh index 6313d1b..2c1670c 100755 --- a/travis/main.sh +++ b/travis/main.sh @@ -3,8 +3,8 @@ . "${0%/*}"/lib.sh # For local deps like blake2b. -export CPPFLAGS="-I${PWD}/../sysroot" -export LDFLAGS="-L${PWD}/../sysroot" +export CPPFLAGS="${CPPFLAGS} -I${PWD}/../sysroot" +export LDFLAGS="${LDFLAGS} -L${PWD}/../sysroot" # ignore timestamps which git doesn't preserve # disable openmp because Clang's libomp isn't installed