From 51ca1f04bd10c332afb9e92b5a9fb397e1aa2e18 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Wed, 12 Mar 2025 14:59:53 -0700
Subject: [PATCH] build: remove cross-compilation support

These can be controlled by the user external to the project. Remove this
to simplify the rules.
---
 CMakeLists.txt                             |  9 ---
 cmake/modules/DispatchWindowsSupport.cmake | 74 ----------------------
 2 files changed, 83 deletions(-)
 delete mode 100644 cmake/modules/DispatchWindowsSupport.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c040cb2a5..3211ba2f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,15 +20,6 @@ if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL Windows)
-  if(NOT MINGW)
-    include(DispatchWindowsSupport)
-    dispatch_windows_arch_spelling(${CMAKE_SYSTEM_PROCESSOR} DISPATCH_MSVC_ARCH)
-    dispatch_windows_include_for_arch(${DISPATCH_MSVC_ARCH} DISPATCH_INCLUDES)
-    include_directories(BEFORE SYSTEM ${DISPATCH_INCLUDES})
-    dispatch_windows_lib_for_arch(${CMAKE_SYSTEM_PROCESSOR} DISPATCH_LIBDIR)
-    link_directories(${DISPATCH_LIBDIR})
-  endif()
-
   include(CheckCSourceCompiles)
   include(CheckSymbolExists)
 
diff --git a/cmake/modules/DispatchWindowsSupport.cmake b/cmake/modules/DispatchWindowsSupport.cmake
deleted file mode 100644
index 750b3be11..000000000
--- a/cmake/modules/DispatchWindowsSupport.cmake
+++ /dev/null
@@ -1,74 +0,0 @@
-
-function(dispatch_windows_arch_spelling arch var)
-  if(${arch} STREQUAL i686)
-    set(${var} x86 PARENT_SCOPE)
-  elseif(${arch} STREQUAL x86_64 OR ${arch} STREQUAL AMD64)
-    set(${var} x64 PARENT_SCOPE)
-  elseif(${arch} STREQUAL armv7)
-    set(${var} arm PARENT_SCOPE)
-  elseif(${arch} STREQUAL aarch64 OR ${arch} STREQUAL ARM64)
-    set(${var} arm64 PARENT_SCOPE)
-  else()
-    message(FATAL_ERROR "do not know MSVC spelling for ARCH: `${arch}`")
-  endif()
-endfunction()
-
-function(dispatch_verify_windows_environment_variables)
-  set(VCToolsInstallDir $ENV{VCToolsInstallDir})
-  set(UniversalCRTSdkDir $ENV{UniversalCRTSdkDir})
-  set(UCRTVersion $ENV{UCRTVersion})
-
-  if("${VCToolsInstallDir}" STREQUAL "")
-    message(SEND_ERROR "VCToolsInstallDir environment variable must be set")
-  endif()
-  if("${UniversalCRTSdkDir}" STREQUAL "")
-    message(SEND_ERROR "UniversalCRTSdkDir environment variable must be set")
-  endif()
-  if("${UCRTVersion}" STREQUAL "")
-    message(SEND_ERROR "UCRTVersion environment variable must be set")
-  endif()
-endfunction()
-
-function(dispatch_windows_include_for_arch arch var)
-  dispatch_verify_windows_environment_variables()
-
-  set(paths
-        "$ENV{VCToolsInstallDir}/include"
-        "$ENV{UniversalCRTSdkDir}/Include/$ENV{UCRTVersion}/ucrt"
-        "$ENV{UniversalCRTSdkDir}/Include/$ENV{UCRTVersion}/shared"
-        "$ENV{UniversalCRTSdkDir}/Include/$ENV{UCRTVersion}/um")
-  set(${var} ${paths} PARENT_SCOPE)
-endfunction()
-
-function(dispatch_windows_lib_for_arch arch var)
-  dispatch_verify_windows_environment_variables()
-  dispatch_windows_arch_spelling(${arch} ARCH)
-
-  set(paths)
-  if(${ARCH} STREQUAL x86)
-    list(APPEND paths "$ENV{VCToolsInstallDir}/Lib")
-  else()
-    list(APPEND paths "$ENV{VCToolsInstallDir}/Lib/${ARCH}")
-  endif()
-  list(APPEND paths
-          "$ENV{UniversalCRTSdkDir}/Lib/$ENV{UCRTVersion}/ucrt/${ARCH}"
-          "$ENV{UniversalCRTSdkDir}/Lib/$ENV{UCRTVersion}/um/${ARCH}")
-  set(${var} ${paths} PARENT_SCOPE)
-endfunction()
-
-function(dispatch_windows_generate_sdk_vfs_overlay flags)
-  dispatch_verify_windows_environment_variables()
-
-  get_filename_component(VCToolsInstallDir $ENV{VCToolsInstallDir} ABSOLUTE)
-  get_filename_component(UniversalCRTSdkDir $ENV{UniversalCRTSdkDir} ABSOLUTE)
-  set(UCRTVersion $ENV{UCRTVersion})
-
-  # TODO(compnerd) use a target to avoid re-creating this file all the time
-  configure_file("${PROJECT_SOURCE_DIR}/utils/WindowsSDKVFSOverlay.yaml.in"
-                 "${PROJECT_BINARY_DIR}/windows-sdk-vfs-overlay.yaml"
-                 @ONLY)
-
-  set(${flags}
-      -ivfsoverlay;"${PROJECT_BINARY_DIR}/windows-sdk-vfs-overlay.yaml"
-      PARENT_SCOPE)
-endfunction()