aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2019-09-20 12:45:39 +0000
committerTony Sarajärvi <tony.sarajarvi@qt.io>2020-06-11 10:40:20 +0000
commit3bd4b2760eb68b528ab26b80f9eaa40a55803211 (patch)
tree8573f24e30f5f236cbc5133a0671792306810783 /coin/platform_configs
parent30714c7cb7d6f6820c9abde676137ff63832fd04 (diff)
Update ICC 18 to ICC 19.1
Task-number: QTQAINFRA-3241 Change-Id: I9259a9f602e8cdec29720178331dd7b833e52f81 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/default.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 0aa4d97b..296fdf52 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -60,9 +60,10 @@ Configurations:
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-openSUSE-15.1-x86_64'
- Compiler: 'ICC_18'
+ Compiler: 'ICC'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+ Environment variables: ['LD_LIBRARY_PATH=$ICC64_19_LDLP:$LD_LIBRARY_PATH', 'PATH=$ICC64_19_PATH:$PATH' ]
-
Template: 'qtci-linux-openSUSE-15.1-x86_64'
Target os: 'WebAssembly'