diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-08 13:47:30 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-10 09:22:27 +0000 |
| commit | b32ddd664e79c41b7b7811e834a20895fb0fcde3 (patch) | |
| tree | 4fe909ec4d1bde14f2d98a118ecf68db87480e56 | |
| parent | e6b83b4600b86bd866aee6b797d9ab6a29c54a92 (diff) | |
| download | qtwebengine-chromium-b32ddd664e79c41b7b7811e834a20895fb0fcde3.tar.gz | |
Do not depend on pywin32
This code worked around a windows kernel bug triggered by ldd, but we
don't use ldd.
Change-Id: Ib5fe8e0a40766c129cd8d106a78aaf58888b8b25
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/build/toolchain/win/tool_wrapper.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/build/toolchain/win/tool_wrapper.py b/chromium/build/toolchain/win/tool_wrapper.py index 350fd6a8199..aa6b3bc4899 100644 --- a/chromium/build/toolchain/win/tool_wrapper.py +++ b/chromium/build/toolchain/win/tool_wrapper.py @@ -23,10 +23,12 @@ import sys # if it finds versions with a different bitness first then win32file.pyd will # fail to load with a cryptic error: # ImportError: DLL load failed: %1 is not a valid Win32 application. +""" if sys.platform == 'win32': os.environ['PATH'] = os.path.dirname(sys.executable) + \ os.pathsep + os.environ['PATH'] import win32file # pylint: disable=import-error +""" BASE_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -183,6 +185,7 @@ class WinTool(object): result = link.wait() if not retry: break + """ if result == 0 and sys.platform == 'win32': # Flush the file buffers to try to work around a Windows 10 kernel bug, # https://crbug.com/644525 @@ -190,6 +193,7 @@ class WinTool(object): 0, None, win32file.OPEN_EXISTING, 0, 0) win32file.FlushFileBuffers(output_handle) output_handle.Close() + """ return result def ExecAsmWrapper(self, arch, *args): |