From c230f55f20dd40b12ded520d381bb43026b340bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 21 Nov 2022 15:19:54 +0100 Subject: [PATCH] Provisioning: Remove QDOC_USE_STATIC_LIBCLANG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove handling of QDOC_USE_STATIC_LIBCLANG environment variable. The variable is not used by the Qt 6 build system. Change-Id: I8af68382caea2864543a3d6e6ed2922823a2e71d Reviewed-by: Topi Reiniö Reviewed-by: Tor Arne Vestbø --- coin/provisioning/common/unix/libclang.sh | 4 ---- coin/provisioning/common/windows/libclang.ps1 | 6 ------ 2 files changed, 10 deletions(-) diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 8d0c4466..d6185d1f 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -58,7 +58,3 @@ rm -rf $zip echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile echo "libClang = $version" >> ~/versions.txt - -# This is a hacked static build of libclang which requires special -# handling on the qdoc side. -SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 69351623..57f42057 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -62,9 +62,3 @@ if ( $setDefault ) { Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-$archVer") } Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer") - -if ( $libclang_version -eq "15.0.0" ) { - # This is a hacked static build of libclang which requires special - # handling on the qdoc side. - Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1" -}