From 89e85ee2fb4d9491f0ce94ef6cb63a30e0e99a9a Mon Sep 17 00:00:00 2001
From: Pea Nut <peanut2@systemli.org>
Date: Tue, 3 Sep 2024 10:14:32 +0200
Subject: [PATCH] [Makefile] Don't overwrite QMAKE env when calling build.sh
gui/build.sh already knows how to find the right qmake executable. We
don't have to overwrite it here. On ArchLinux, we need qmake6 instead of
qmake. The Makefile sets QMAKE=qmake, even if `gui/build.sh` knows
better (but not if QMAKE is already set).
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 47decf21..cff1b9ad 100644
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ build_gui: build_golib relink_vendor
@echo "==============BUILD GUI==============="
@echo "TARGET: ${TARGET}"
@echo "VENDOR_PATH: ${VENDOR_PATH}"
- @XBUILD=no CC=${CC} CXX=${CXX} MAKE=${MAKE} AR=${AR} LD=${LD} QMAKE=${QMAKE} LRELEASE=${LRELEASE} TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} APPNAME=${APPNAME} gui/build.sh --skip-golib
+ @XBUILD=no CC=${CC} CXX=${CXX} MAKE=${MAKE} AR=${AR} LD=${LD} LRELEASE=${LRELEASE} TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} APPNAME=${APPNAME} gui/build.sh --skip-golib
@echo "============BUILD GUI================="
build: build_helper build_gui
--
GitLab