From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sat, 7 Dec 2019 09:04:34 +0000 (+0000)
Subject: haskell-cabal.eclass: pass _EXTRA variables after "$@".
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=29fef0e4736b582c2a5560733d173db412862b8d;p=gentoo.git

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

That way user's override has highest precedence.

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

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