From 466fcb3297f91043d8b7ce66b611568d54fc0b9f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 6 May 2015 19:33:06 -0700 Subject: [PATCH] spidermonkey: fix improper error handling Mixing `local` and `|| die` will never work because the exit status being tested is that of local, not any subcommands that may be involved. --- .../dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild index 344ee5b0b9..2c3ccdd4c5 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/spidermonkey/spidermonkey-17.0.0-r4.ebuild @@ -56,6 +56,7 @@ src_prepare() { } src_configure() { + local nspr_cflags nspr_libs cd "${BUILDDIR}" || die # Mozilla screws up the meaning of BUILD, HOST, and TARGET :( @@ -67,8 +68,8 @@ src_configure() { HOST_AR="${BUILD_AR}" HOST_RANLIB="${BUILD_RANLIB}" # Use pkg-config instead of nspr-config to use $SYSROOT - local nspr_cflags="$(${PKG_CONFIG} --cflags nspr)" || die - local nspr_libs="$(${PKG_CONFIG} --libs nspr)" || die + nspr_cflags="$(${PKG_CONFIG} --cflags nspr)" || die + nspr_libs="$(${PKG_CONFIG} --libs nspr)" || die econf \ ${myopts} \