From e1a3cf6c461ba26537d4a643b82d0b336ecdea79 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 31 Dec 2019 20:46:36 +0100 Subject: [PATCH 13/26] Add /d1trimfile:%SRC_DIR% to make pdbs more relocatable --- Lib/distutils/_msvccompiler.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py index af8099a4078..0b245adb309 100644 --- a/Lib/distutils/_msvccompiler.py +++ b/Lib/distutils/_msvccompiler.py @@ -346,6 +346,13 @@ def compile(self, sources, # without asking the user to browse for it src = os.path.abspath(src) + # Anaconda/conda-forge customisation, we want our pdbs to be + # relocatable: + # https://developercommunity.visualstudio.com/comments/623156/view.html + d1trimfile_opts = [] + if 'SRC_DIR' in os.environ and os.path.basename(self.cc) == "cl.exe": + d1trimfile_opts.append("/d1trimfile:" + os.environ['SRC_DIR']) + if ext in self._c_extensions: input_opt = "/Tc" + src elif ext in self._cpp_extensions: @@ -390,7 +397,7 @@ def compile(self, sources, raise CompileError("Don't know how to compile {} to {}" .format(src, obj)) - args = [self.cc] + compile_opts + pp_opts + args = [self.cc] + compile_opts + pp_opts + d1trimfile_opts if add_cpp_opts: args.append('/EHsc') args.append(input_opt)