diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2015-09-07 16:01:35 -0400 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2015-09-07 16:01:48 -0400 |
| commit | 419cd66ae4db7e0d969d8843ffae485be51c20a4 (patch) | |
| tree | b4e4802da738f88a479bb4f3671007891295db2c | |
| parent | unset MOZ_DEV_EDITION define but add back some of the pref's when USE=bindist (diff) | |
| download | mozilla-419cd66ae4db7e0d969d8843ffae485be51c20a4.tar.gz mozilla-419cd66ae4db7e0d969d8843ffae485be51c20a4.tar.bz2 mozilla-419cd66ae4db7e0d969d8843ffae485be51c20a4.zip | |
Ensure $SHELL gets set to something, fixes build crash for catalyst
| -rw-r--r-- | www-client/firefox/firefox-40.0.3.ebuild | 4 | ||||
| -rw-r--r-- | www-client/firefox/firefox-41.0_beta6.ebuild | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/www-client/firefox/firefox-40.0.3.ebuild b/www-client/firefox/firefox-40.0.3.ebuild index a467abf0..d9d99ac1 100644 --- a/www-client/firefox/firefox-40.0.3.ebuild +++ b/www-client/firefox/firefox-40.0.3.ebuild @@ -281,11 +281,11 @@ src_compile() { addpredict "${cards}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ Xemake -f client.mk profiledbuild || die "Xemake failed" else CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ emake -f client.mk realbuild fi diff --git a/www-client/firefox/firefox-41.0_beta6.ebuild b/www-client/firefox/firefox-41.0_beta6.ebuild index bdf78327..44b94041 100644 --- a/www-client/firefox/firefox-41.0_beta6.ebuild +++ b/www-client/firefox/firefox-41.0_beta6.ebuild @@ -281,11 +281,11 @@ src_compile() { addpredict "${cards}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ Xemake -f client.mk profiledbuild || die "Xemake failed" else CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ emake -f client.mk realbuild fi |