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 987E9139694 for ; Sun, 9 Jul 2017 21:34:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E49A421411B; Sun, 9 Jul 2017 21:34:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD8EA21411B for ; Sun, 9 Jul 2017 21:34:04 +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 9B45B341BDC for ; Sun, 9 Jul 2017 21:34:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 073DA7477 for ; Sun, 9 Jul 2017 21:34:02 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1499636035.62394fcca76f4c6b433884a3d48a84ae7b775600.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild sys-libs/compiler-rt/compiler-rt-9999.ebuild X-VCS-Directories: sys-libs/compiler-rt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 62394fcca76f4c6b433884a3d48a84ae7b775600 X-VCS-Branch: master Date: Sun, 9 Jul 2017 21:34:02 +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-Archives-Salt: 6d8c63f3-6155-4198-88dc-800ebbf511aa X-Archives-Hash: 93fb490d3f396f82cd6cae56e27309c7 commit: 62394fcca76f4c6b433884a3d48a84ae7b775600 Author: Michał Górny gentoo org> AuthorDate: Sun Jul 9 08:16:54 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jul 9 21:33:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62394fcc sys-libs/compiler-rt: Simplify -- use common nolib flag var sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild | 10 +++++----- sys-libs/compiler-rt/compiler-rt-9999.ebuild | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild index 00141f900ff..98d9f66212b 100644 --- a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild @@ -48,17 +48,17 @@ src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/${P}_build + local nolib_flags=( -nodefaultlibs -lc ) if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ # ensure we can use clang before installing compiler-rt - local -x LDFLAGS="${LDFLAGS} -nodefaultlibs -lc" + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" strip-unsupported-flags elif ! test_compiler; then - local extra_flags=( -nodefaultlibs -lc ) - if test_compiler "${extra_flags[@]}"; then - local -x LDFLAGS="${LDFLAGS} ${extra_flags[*]}" - ewarn "${CC} seems to lack runtime, trying with ${extra_flags[*]}" + if test_compiler "${nolib_flags[@]}"; then + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" fi fi diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild index 4758eab553a..ffd1e9eddb3 100644 --- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild @@ -49,17 +49,17 @@ src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/${P}_build + local nolib_flags=( -nodefaultlibs -lc ) if use clang; then local -x CC=${CHOST}-clang local -x CXX=${CHOST}-clang++ # ensure we can use clang before installing compiler-rt - local -x LDFLAGS="${LDFLAGS} -nodefaultlibs -lc" + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" strip-unsupported-flags elif ! test_compiler; then - local extra_flags=( -nodefaultlibs -lc ) - if test_compiler "${extra_flags[@]}"; then - local -x LDFLAGS="${LDFLAGS} ${extra_flags[*]}" - ewarn "${CC} seems to lack runtime, trying with ${extra_flags[*]}" + if test_compiler "${nolib_flags[@]}"; then + local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" + ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}" fi fi