From 15bfe0fbd84a32e78263188ea621df7f3509a5bb Mon Sep 17 00:00:00 2001 From: Kaiyang Wu Date: Sun, 13 Sep 2026 22:55:52 +0800 Subject: [PATCH 1/2] templates/qtproj: set mkspec depending on USECLANG Signed-off-by: Kaiyang Wu --- templates/20-qtproj.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/20-qtproj.sh b/templates/20-qtproj.sh index 1f3ab11..06b3229 100644 --- a/templates/20-qtproj.sh +++ b/templates/20-qtproj.sh @@ -24,10 +24,18 @@ build_qtproj_configure() { else abdie "Unknown qmake version: ${QMAKEVER}." fi + + export QTPROJ_SPEC + if bool "$USECLANG"; then + QTPROJ_SPEC=" -spec linux-clang " + else + QTPROJ_SPEC=" -spec linux-g++ " + fi + ab_tostringarray QTPROJ_AFTER ab_typecheck -a QTPROJ_DEF abinfo "Running ${QMAKE} to generate Makefile ..." - "/usr/bin/${QMAKE}" "${QTPROJ_DEF[@]}" "${QTPROJ_AFTER[@]}" \ + "/usr/bin/${QMAKE}" $QTPROJ_SPEC "${QTPROJ_DEF[@]}" "${QTPROJ_AFTER[@]}" \ || abdie "Failed while running qmake to generate Makefile: $?." } From e7fe0f7c7a1b77bf2c5dc0437a92df70f3c98c55 Mon Sep 17 00:00:00 2001 From: Kaiyang Wu Date: Mon, 14 Sep 2026 10:46:43 +0800 Subject: [PATCH 2/2] sets/exports: add QMAKEVER variable Signed-off-by: Kaiyang Wu --- sets/exports.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sets/exports.json b/sets/exports.json index 99b4f34..5e5cba1 100644 --- a/sets/exports.json +++ b/sets/exports.json @@ -70,7 +70,8 @@ "ABMK", "DUNE_INSTALL_AFTER", "DUNE_PACKAGES", - "DUNE_BUILD_AFTER" + "DUNE_BUILD_AFTER", + "QMAKEVER" ], "python": ["ABPY2VER", "ABPY2SHORTVER", "ABPY3VER", "ABPY3SHORTVER"] }