From 054c1aaf79e1059361ec6f299b2a90e77dd08b12 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 22 Oct 2020 18:30:50 +0200 Subject: CMake: Don't use mkspec set by sourcing b2qt environment script qmake sees the QMAKESPEC variable and uses it when building tests, instead of using the target mkspec written in the target_qt.conf file by the build system. Unset the environment variable to force usage of the mkspec specified when confugring Qt. Task-number: QTBUG-86053 Change-Id: I24ceddd1436393b496665e439dd1441ecbd36df7 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- coin/instructions/prepare_building_env.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index a9e9ec3a8e..edba3b0ebc 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -233,8 +233,9 @@ instructions: - type: Group instructions: + # Need to unset QMAKESPEC, so that the pre-installed boot2qt mkspec is not picked up. - type: WriteFile - fileContents: "#!/bin/bash\nunset LD_LIBRARY_PATH\n. {{.Env.QT_YOCTO_ENVSETUP}}\nexport PATH={{.Env.QT_CMAKE_DIR}}:$PATH;\n$*" + fileContents: "#!/bin/bash\nunset LD_LIBRARY_PATH\n. {{.Env.QT_YOCTO_ENVSETUP}}\nexport PATH={{.Env.QT_CMAKE_DIR}}:$PATH;\nunset QMAKESPEC\n$*" filename: "{{.Env.HOME}}/prefix.sh" fileMode: 493 maxTimeInSeconds: 20 -- cgit v1.2.3