Make cl-wrapper compatible with windows

Author: bwrsandman

CMakeLists.txt

@@ -8,8 +8,11 @@ FetchContent_Declare(
   URL_HASH MD5=73e7cc13e078c56c7798c3f6686fbea4
 )
 FetchContent_MakeAvailable(msvc_compiler)
-set(CMAKE_CXX_COMPILER "${CMAKE_CURRENT_SOURCE_DIR}/scripts/source_code/wine-cl-wrapper.py")
-set(CMAKE_CXX_COMPILER_ARG1 "${msvc_compiler_SOURCE_DIR}")
+
+find_package(Python3 REQUIRED)
+
+set(CMAKE_CXX_COMPILER ${Python3_EXECUTABLE})
+set(CMAKE_CXX_COMPILER_ARG1 "${CMAKE_CURRENT_SOURCE_DIR}/scripts/source_code/wine-cl-wrapper.py ${msvc_compiler_SOURCE_DIR}")
 set(CMAKE_CXX_COMPILER_WORKS ON)
 
 # Set the llvm utils before project so the toolchain selection has the right paths
@@ -67,7 +70,6 @@ set(CMAKE_CXX_FLAGS_DEBUG "/Zi /TP /MT /GR")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Zi /TP /MT /GR /O2")
 set(CMAKE_CXX_FLAGS_RELEASE "/TP /MT /GR /O2")
 
-find_package(Python3 REQUIRED)
 find_program(LLVM_STRIP_EXECUTABLE NAMES llvm-strip REQUIRED)
 find_program(LLVM_AR_EXECUTABLE NAMES llvm-ar REQUIRED)
 find_program(LLVM_OBJCOPY_EXECUTABLE NAMES llvm-objcopy REQUIRED)
@@ -1121,4 +1123,3 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -E md5sum "$<TARGET_FILE:runblack-reassembled>"
     COMMENT "Computing the md5sum"
 )
-

scripts/source_code/wine-cl-wrapper.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 
 """
-Provide a single file that can act as a compiler on linux while forwarding the calls through wine and fixing up the arguments
+Provide a single file that can act as a compiler on linux while forwarding the calls through wine and fixing up the arguments.
+On windows, prevent cmake from thinking this is a msvc compiler and forward build commands.
 """
 
 import os
@@ -16,7 +17,53 @@ def winepath(path: pathlib.Path) -> str:
     return path.as_posix().replace("/", "\\")
 
 
-def main():
+def clang_to_msvc_commands(args: list[str], wine_path: bool) -> list[str]:
+    skip_next = False
+    commands = []
+    for i, c in enumerate(args):
+        if skip_next:
+            skip_next = False
+            continue
+        elif c == '-c':
+            commands.append('/c')
+        elif c.startswith("-I"):
+            commands.append('/I' + c[2:])
+        elif c == '-o':
+            commands.append(f'/Fo{args[i+1]}')
+            skip_next = True
+        elif c in ('-target', 'i686-pc-windows-gnu', '-m32', '-masm=intel', '-march=i386'):
+            continue
+        elif wine_path and pathlib.Path(c).exists():
+            commands.append(f'Z:{c}')
+        else:
+            commands.append(c)
+    return commands
+
+
+def cl_call_passthrough():
+    # Prevent CMake from identifying the compiler
+    if "CMakeCXXCompilerId.cpp" in sys.argv:
+        return 1
+    """Prevents cmake from complaining about mixing cl and clang on windows"""
+    msvc_base = pathlib.Path(sys.argv[1])
+    cl_path = msvc_base / "BIN/CL.EXE"
+
+    env = os.environ.copy()
+    env["PATH"] = str(msvc_base / "BIN")
+    env["INCLUDE"] = str(msvc_base / "INCLUDE")
+
+    commands = [cl_path.as_posix(), "/nologo"] + clang_to_msvc_commands(sys.argv[2:], False)
+
+    # print(' '.join(sys.argv) + ' => ' + ' '.join(commands))
+    result = subprocess.run(commands, capture_output=True, env=env)
+
+    sys.stdout.write(result.stdout.decode())
+    sys.stderr.write(result.stderr.decode())
+
+    return result.returncode
+
+
+def wrap_cl_call_with_wine():
     msvc_base = pathlib.Path(sys.argv[1])
     cl_path = msvc_base / "BIN/CL.EXE"
 
@@ -35,26 +82,11 @@ def main():
         args.append(a)
 
     subs = {}
-    skip_next = False
     for i, c in enumerate(args):
-        if skip_next:
-            skip_next = False
-            continue
-        elif c == '-c':
-            commands.append('/c')
-        elif c.startswith("-I"):
-            commands.append('/I' + c[2:])
-        elif c == '-o':
-            commands.append(f'/Fo{args[i+1]}')
-            skip_next = True
-        elif c in ('-target', 'i686-pc-windows-gnu', '-m32', '-masm=intel', '-march=i386'):
-            continue
-        elif pathlib.Path(c).exists():
-            commands.append(f'Z:{c}')
-        else:
-            if c.startswith("Z:/"):
-                subs[os.path.basename(c[2:]) + '\r\n'] = ''
-            commands.append(c)
+        if c.startswith("Z:/"):
+            subs[os.path.basename(c[2:]) + '\r\n'] = ''
+
+    commands += clang_to_msvc_commands(args, True)
 
     # print(' '.join(sys.argv) + ' => ' + ' '.join(commands))
     project_root = pathlib.Path(__file__).parent.parent.parent
@@ -79,4 +111,6 @@ def fix_paths(string):
     return result.returncode
 
 if __name__ == "__main__":
-    exit(main())
+    if os.name == 'nt':
+        exit(cl_call_passthrough())
+    exit(wrap_cl_call_with_wine())