Merge pull request #693 from jdpurcell/pr-winvcrworkaround

Windows: Workaround for crashing with older Visual C++ runtimes
jurplel · Jul 14, 2024 · fc02b1c · fc02b1c
2 parents c277a97 + 6930470
commit fc02b1c
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/dist/scripts/build.ps1 b/dist/scripts/build.ps1
@@ -9,12 +9,13 @@ if ($IsWindows) {
     dist/scripts/vcvars.ps1
 }
 
-if ($env:buildArch -eq 'Universal') {
-    qmake QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64" $args[0] PREFIX=$Prefix DEFINES+="$env:nightlyDefines"
-} else {
-    qmake $args[0] PREFIX=$Prefix DEFINES+="$env:nightlyDefines"
+if ($IsMacOS -and $env:buildArch -eq 'Universal') {
+    $argDeviceArchs = 'QMAKE_APPLE_DEVICE_ARCHS=x86_64 arm64'
+} elseif ($IsWindows) {
+    # Workaround for https://developercommunity.visualstudio.com/t/10664660
+    $argVcrMutexWorkaround = 'DEFINES+=_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR'
 }
-
+qmake $args[0] PREFIX=$Prefix DEFINES+="$env:nightlyDefines" $argVcrMutexWorkaround $argDeviceArchs
 
 if ($IsWindows) {
     nmake