From 90c35c4ac1666e4ea99c034dcedd381cc04c54c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 8 May 2022 08:12:03 +0700
Subject: [PATCH] common/do_check: move make_check_pre behind env setting

All environment variables setting in command execution must be put
before any non-variables-like, otherwise, they're intepretted as
something else.

Fix: 71b11fdbdb, (xbps-src: add make_check_pre, 2022-02-28)
---
 common/build-style/python3-module.sh | 3 ++-
 common/build-style/raku-dist.sh      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh
index 8daf40e6921..6ec5225d6aa 100644
--- a/common/build-style/python3-module.sh
+++ b/common/build-style/python3-module.sh
@@ -25,7 +25,8 @@ do_build() {
 
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		${make_check_pre} PYTHONPATH="$(cd build/lib* && pwd)" \
+		PYTHONPATH="$(cd build/lib* && pwd)" \
+			${make_check_pre} \
 			python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		# Fall back to deprecated setup.py test orchestration without pytest
diff --git a/common/build-style/raku-dist.sh b/common/build-style/raku-dist.sh
index bbbba96e714..67350161b93 100644
--- a/common/build-style/raku-dist.sh
+++ b/common/build-style/raku-dist.sh
@@ -3,7 +3,7 @@
 #
 
 do_check() {
-	${make_check_pre} RAKULIB=lib prove -r -e raku t/
+	RAKULIB=lib ${make_check_pre} prove -r -e raku t/
 }
 
 do_install() {