summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-12-12 15:33:31 -0800
committerKonstantin Tokarev <annulen@yandex.ru>2016-12-13 07:45:15 +0000
commitc6a621dba39fdcb5d1c05eb5160e59d3ace6e179 (patch)
tree84347770543ff66f91529d5981373b0f5da7bada
parent67fef93059ba23812d7390ec7bb8d70f8e7b0492 (diff)
Fix build with MSYS Python
MSYS's Python is compiled as a POSIX environment, which means subprocess.Popen cannot be passed just a single string (to be given to CreateProcess). Instead, pass the split args and let the underlying system re-merge them. This is harmless with a pure Windows Python. MSYS python also changes parameters starting with / to a pathname, so use the equivalent -directives (dumpbin.exe accepts them). Change-Id: Id50531a20e40adb71a40525cf714d05c22959fb0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rwxr-xr-xTools/Scripts/generate-win32-export-forwards2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/Scripts/generate-win32-export-forwards b/Tools/Scripts/generate-win32-export-forwards
index a160abb18..37375b77b 100755
--- a/Tools/Scripts/generate-win32-export-forwards
+++ b/Tools/Scripts/generate-win32-export-forwards
@@ -28,7 +28,7 @@ import sys
import re
def exportForwardsForLibrary(library):
- dumpBin = subprocess.Popen("dumpbin /directives " + library, stdout=subprocess.PIPE, universal_newlines=True)
+ dumpBin = subprocess.Popen(["dumpbin.exe", "-directives", library], stdout=subprocess.PIPE, universal_newlines=True)
output = dumpBin.communicate()[0]
return output