[Python-checkins] cpython (merge 3.4 -> 3.4): Merge heads

[zach.ware]

https://hg.python.org/cpython/rev/4a10fb845f85
changeset:   95571:4a10fb845f85
branch:      3.4
parent:      95563:89eb5d9f7541
parent:      95570:cf19bd089768
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Apr 13 10:51:37 2015 -0500
summary:
  Merge heads

files:
  PCbuild/build_ssl.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -170,7 +170,11 @@
         make_flags = "-a"
     # perl should be on the path, but we also look in "\perl" and "c:\\perl"
     # as "well known" locations
-    perls = find_all_on_path("perl.exe", ["\\perl\\bin", "C:\\perl\\bin"])
+    perls = find_all_on_path("perl.exe", [r"\perl\bin",
+                                          r"C:\perl\bin",
+                                          r"\perl64\bin",
+                                          r"C:\perl64\bin",
+                                         ])
     perl = find_working_perl(perls)
     if perl:
         print("Found a working perl at '%s'" % (perl,))

-- 
Repository URL: https://hg.python.org/cpython