aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Seiderer <ps.report@gmx.net>2018-12-10 20:46:15 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-10 20:49:09 +0100
commitb24340bef7188ee3433b0c17251f85dd8a8bd302 (patch)
tree11e99834c5327975813798d8b92749357dbc8866
parent598cd3dc55dfd805de0fa7416062ee3c4a063402 (diff)
downloadbuildroot-b24340bef7188ee3433b0c17251f85dd8a8bd302.tar.gz
buildroot-b24340bef7188ee3433b0c17251f85dd8a8bd302.tar.bz2
package/qt5/qt5base: do not change QMAKE_COMPILER in g++-base.conf
The variable QMAKE_COMPILER determines the compiler flavour (e.g. gcc, clang, llvm, msvc etc.) and not a compiler path. Changing it confuses the platform test of the qt5webengine package (mkspecs/features/platform.prf): defineTest(isPlatformSupported) { QT_FOR_CONFIG += gui-private linux { if(!gcc:!clang)|intel_icc { skipBuild("Qt WebEngine on Linux requires clang or GCC.") return(false) } gcc:!clang:!isGCCVersionSupported(): return(false) } } Revert the variable change introduced by commit 'package/qt5/qt5base: use ccache for building host code' ([2]). Fixes raspberrypi3_qt5we_defconfig/qt5webengine build ([1]): Qt WebEngine on Linux requires clang or GCC. QtWebEngine will not be built. [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/131217091 [2] https://git.buildroot.net/buildroot/commit/?id=c2ea056a1b34fd1354100d08e603b9374e225968 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/qt5/qt5base/qt5base.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 98297d87db..d10f233b46 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -273,7 +273,6 @@ endif
# This allows to use ccache when available
define QT5BASE_CONFIGURE_HOSTCC
- $(SED) 's,^QMAKE_COMPILER\s*=.*,QMAKE_COMPILER = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf
$(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf
$(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf
endef