3 files changed, 18 insertions, 2 deletions
diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1
index 42bad4bcd..cf363f12e 100644
--- a/scripts/buildsystems/msbuild/applocal.ps1
+++ b/scripts/buildsystems/msbuild/applocal.ps1
@@ -15,7 +15,14 @@ if ($copiedFilesLog)
 # Note: this function signature is depended upon by the qtdeploy.ps1 script introduced in 5.7.1-7
 function deployBinary([string]$targetBinaryDir, [string]$SourceDir, [string]$targetBinaryName) {
     if (Test-Path "$targetBinaryDir\$targetBinaryName") {
-        Write-Verbose "  ${targetBinaryName}: already present"
+        $sourceModTime = (Get-Item $SourceDir\$targetBinaryName).LastWriteTime
+        $destModTime = (Get-Item $targetBinaryDir\$targetBinaryName).LastWriteTime
+        if ($destModTime -lt $sourceModTime) {
+            Write-Verbose "  ${targetBinaryName}: Updating $SourceDir\$targetBinaryName"
+            Copy-Item "$SourceDir\$targetBinaryName" $targetBinaryDir
+        } else {
+            Write-Verbose "  ${targetBinaryName}: already present"
+        }
     }
     else {
         Write-Verbose "  ${targetBinaryName}: Copying $SourceDir\$targetBinaryName"
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets
index 456783f4d..8807befd8 100644
--- a/scripts/buildsystems/msbuild/vcpkg.targets
+++ b/scripts/buildsystems/msbuild/vcpkg.targets
@@ -55,6 +55,9 @@
     <VcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Release')) or '$(VcpkgConfiguration)' == 'RelWithDebInfo' or '$(VcpkgConfiguration)' == 'MinSizeRel'">Release</VcpkgNormalizedConfiguration>
     <VcpkgRoot Condition="'$(VcpkgRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\</VcpkgRoot>
     <VcpkgApplocalDeps Condition="'$(VcpkgApplocalDeps)' == ''">true</VcpkgApplocalDeps>
+    <!-- Deactivate Autolinking if lld is used as a linker. (Until a better way to solve the problem is found!). 
+    Tried to add /lib as a parameter to the linker call but was unable to find a way to pass it as the first parameter. -->
+    <VcpkgAutoLink Condition="'$(UseLldLink)' == 'true' and '$(VcpkgAutoLink)' == ''">false</VcpkgAutoLink>
   </PropertyGroup>
 
   <ItemDefinitionGroup Condition="'$(VcpkgEnabled)' == 'true'">
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 91c196fb9..4ffb123d4 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -50,7 +50,13 @@ else()
         elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
             set(_VCPKG_TARGET_TRIPLET_ARCH x64)
         else()
-            message(FATAL_ERROR "Unable to determine target architecture.")
+            if( _CMAKE_IN_TRY_COMPILE )
+                message(STATUS "Unable to determine target architecture, continuing without vcpkg.")
+            else()
+                message(WARNING "Unable to determine target architecture, continuing without vcpkg.")
+            endif()
+            set(VCPKG_TOOLCHAIN ON)
+            return()
         endif()
     endif()
 endif()