Add clang-cl support to distutils

isuruf · isuruf · commit 4cafa12cd297 · 2020-02-06T01:18:42.000-06:00
Thanks to Zufu Liu (@zufuliu) for the code
diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py
@@ -194,6 +194,14 @@ def _find_exe(exe, paths=None):
     'win-arm64' : 'x86_arm64'
 }
 
+# A map keyed by get_platform() return values to value accepted by
+# clang as the triple.
+PLAT_TO_LLVM_TARGETS = {
+    'win32': 'i686',
+    'win-amd64': 'x86_64',
+    'win-arm64': 'aarch64',
+}
+
 # A set containing the DLLs that are guaranteed to be available for
 # all micro versions of this Python version. Known extension
 # dependencies that are not in this set will be copied to the output
@@ -231,11 +239,12 @@ class MSVCCompiler(CCompiler) :
     exe_extension = '.exe'
 
 
-    def __init__(self, verbose=0, dry_run=0, force=0):
+    def __init__(self, verbose=0, dry_run=0, force=0, use_clang_cl=False):
         CCompiler.__init__ (self, verbose, dry_run, force)
         # target platform (.plat_name is consistent with 'bdist')
         self.plat_name = None
         self.initialized = False
+        self.use_clang_cl = use_clang_cl
 
     def initialize(self, plat_name=None):
         # multi-init means we would need to check platform same each time...
@@ -257,6 +266,8 @@ def initialize(self, plat_name=None):
 
         self._paths = vc_env.get('path', '')
         paths = self._paths.split(os.pathsep)
+        if self.use_clang_cl:
+            self.cc = _find_exe("clang-cl.exe")
         self.cc = _find_exe("cl.exe", paths)
         self.linker = _find_exe("link.exe", paths)
         self.lib = _find_exe("lib.exe", paths)
@@ -295,6 +306,16 @@ def initialize(self, plat_name=None):
         ldflags_debug = [
             '/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL'
         ]
+        if self.use_clang_cl:
+            # Add target for clang
+            target_flag = "{}-pc-windows-msvc".format(PLAT_TO_LLVM_TARGETS[plat_name])
+            self.compile_options.append(target_flag)
+            self.compile_options_debug.append(target_flag)
+            # Remove whole program optimization flags to avoid warnings about
+            # unrecognized options
+            self.compile_options.remove('/GL')
+            ldflags.remove('/LTCG')
+            ldflags_debug.remove('/LTCG')
 
         self.ldflags_exe = [*ldflags, '/MANIFEST:EMBED,ID=1']
         self.ldflags_exe_debug = [*ldflags_debug, '/MANIFEST:EMBED,ID=1']
@@ -587,3 +608,10 @@ def find_library_file(self, dirs, lib, debug=0):
         else:
             # Oops, didn't find it in *any* of 'dirs'
             return None
+
+
+class ClangMSVCCompiler(MSVCCompiler):
+    compiler_type = 'clang-cl'
+
+    def __init__(self, verbose=0, dry_run=0, force=0):
+        MSVCCompiler.__init__(self, verbose, dry_run, force, True)
diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
@@ -968,6 +968,8 @@ def get_default_compiler(osname=None, platform=None):
                                "Mingw32 port of GNU C Compiler for Win32"),
                    'bcpp':    ('bcppcompiler', 'BCPPCompiler',
                                "Borland C++ Compiler"),
+                   'clang-cl':('_msvccompiler', 'ClangMSVCCompiler',
+                               "clang-cl for Microsoft Visual C++"),
                  }
 
 def show_compilers():

Original file line number	Diff line number	Diff line change
`@@ -968,6 +968,8 @@ def get_default_compiler(osname=None, platform=None):`
`968`	`968`	`"Mingw32 port of GNU C Compiler for Win32"),`
`969`	`969`	`'bcpp': ('bcppcompiler', 'BCPPCompiler',`
`970`	`970`	`"Borland C++ Compiler"),`
	`971`	`+ 'clang-cl':('_msvccompiler', 'ClangMSVCCompiler',`
	`972`	`+ "clang-cl for Microsoft Visual C++"),`
`971`	`973`	`}`
`972`	`974`
`973`	`975`	`def show_compilers():`