From 398a42634f34afa1979d88ae1d8b38194e911c2d Mon Sep 17 00:00:00 2001 From: David Seifert Date: Wed, 11 Dec 2019 13:32:00 +0100 Subject: */*: [QA] Remove redundant `|| die` guards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Since all ebuilds in the tree are EAPI>=4, `|| die` on builtin commands is redundant and dead code. Closes: https://github.com/gentoo/gentoo/pull/13940 Reviewed-by: Ulrich Müller Reviewed-by: Michał Górny Reviewed-by: Andreas K. Hüttel Signed-off-by: David Seifert --- sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild') diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild index 2ff38c2b390..f7a37367f25 100644 --- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild @@ -201,8 +201,8 @@ compile_ld64() { LTO_INCDIR=${LLVM_INCDIR} \ LTO_LIBDIR=${LLVM_LIBDIR} \ TAPI=$(use tapi && echo 1 || echo 0) \ - TAPI_LIBDIR="${EPREFIX}"/usr/lib \ - || die "emake failed for ld64" + TAPI_LIBDIR="${EPREFIX}"/usr/lib + use test && emake build_test } @@ -223,16 +223,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { -- cgit v1.2.3-18-g5258