[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sergei Trofimovich]

commit:     29fef0e4736b582c2a5560733d173db412862b8d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 09:04:34 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 09:12:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29fef0e4

haskell-cabal.eclass: pass _EXTRA variables after "$@".

That way user's override has highest precedence.

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 eclass/haskell-cabal.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index edfdfae5cda..690bbf55b1c 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