summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-12-07 09:04:34 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2019-12-07 09:12:08 +0000
commit29fef0e4736b582c2a5560733d173db412862b8d (patch)
tree6ebb98b07082f3ffffdae0755cf170fb0fe8bd20
parentprofiles/package.mask: downgrade PySensors mask to 0.0.3 only (diff)
downloadgentoo-29fef0e4736b582c2a5560733d173db412862b8d.tar.gz
gentoo-29fef0e4736b582c2a5560733d173db412862b8d.tar.bz2
gentoo-29fef0e4736b582c2a5560733d173db412862b8d.zip
haskell-cabal.eclass: pass _EXTRA variables after "$@".
That way user's override has highest precedence. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--eclass/haskell-cabal.eclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index edfdfae5cda3..690bbf55b1c9 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -395,14 +395,14 @@ cabal-configure() {
--datasubdir=${P}/ghc-$(ghc-version) \
"${cabalconf[@]}" \
${CABAL_CONFIGURE_FLAGS} \
- ${CABAL_EXTRA_CONFIGURE_FLAGS} \
- "$@"
+ "$@" \
+ ${CABAL_EXTRA_CONFIGURE_FLAGS}
echo ./setup "$@"
./setup "$@" || cabal-show-brokens-and-die "setup configure failed"
}
cabal-build() {
- set -- build ${CABAL_EXTRA_BUILD_FLAGS} "$@"
+ set -- build "$@" ${CABAL_EXTRA_BUILD_FLAGS}
echo ./setup "$@"
./setup "$@" \
|| die "setup build failed"
@@ -570,8 +570,8 @@ haskell-cabal_src_test() {
set -- test \
"${cabaltest[@]}" \
${CABAL_TEST_FLAGS} \
- ${CABAL_EXTRA_TEST_FLAGS} \
- "$@"
+ "$@" \
+ ${CABAL_EXTRA_TEST_FLAGS}
echo ./setup "$@"
./setup "$@" || die "cabal test failed"
fi