From 8204645cc2a9f9844d718f368fa325e3e4c861f0 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Sun, 19 Apr 2020 19:36:43 -0400 Subject: [PATCH] Use short file names in -imsvc includes on Windows. The compilation command line is too long (exceeds 8,192 chars) for some compile commands. This is an attempt to shorten it. Also, turned down the verbosity of output. --- .../build-toolchain-win-setup_toolchain.py.patch | 13 +++++++++++++ script/redirect-cc.cmd | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 patches/build-toolchain-win-setup_toolchain.py.patch diff --git a/patches/build-toolchain-win-setup_toolchain.py.patch b/patches/build-toolchain-win-setup_toolchain.py.patch new file mode 100644 index 00000000000..4e61ee105af --- /dev/null +++ b/patches/build-toolchain-win-setup_toolchain.py.patch @@ -0,0 +1,13 @@ +diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py +index 2ab240da454821965080c82899c382a57d674d80..3d4381a30486655965aebd84ee152dce939d1801 100644 +--- a/build/toolchain/win/setup_toolchain.py ++++ b/build/toolchain/win/setup_toolchain.py +@@ -272,7 +272,7 @@ def main(): + def q(s): # Quote s if it contains spaces or other weird characters. + return s if re.match(r'^[a-zA-Z0-9._/\\:-]*$', s) else '"' + s + '"' + include_I = ' '.join([q('/I' + i) for i in include]) +- include_imsvc = ' '.join([q('-imsvc' + i) for i in include]) ++ import win32api; include_imsvc = ' '.join([q('-imsvc' + win32api.GetShortPathName(i)) for i in include]) + libpath_flags = ' '.join([q('-libpath:' + i) for i in lib]) + + if (environment_block_name != ''): diff --git a/script/redirect-cc.cmd b/script/redirect-cc.cmd index 92770e91bf9..5f3422177f6 100644 --- a/script/redirect-cc.cmd +++ b/script/redirect-cc.cmd @@ -1 +1,2 @@ -python ..\..\brave\script\redirect-cc.py %* +@ECHO OFF +python ..\..\brave\script\redirect-cc.py %*