Merge 3.5

kristjanvalur · Jan 11, 2016 · 0633cb7 · 0633cb7
2 parents 37dc2b2 + b2b1217
commit 0633cb7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
@@ -260,7 +260,12 @@ def _parse_makefile(filename, vars=None):
     while len(variables) > 0:
         for name in tuple(variables):
             value = notdone[name]
-            m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
+            m1 = _findvar1_rx.search(value)
+            m2 = _findvar2_rx.search(value)
+            if m1 and m2:
+                m = m1 if m1.start() < m2.start() else m2
+            else:
+                m = m1 if m1 else m2
             if m is not None:
                 n = m.group(1)
                 found = True

diff --git a/Misc/NEWS b/Misc/NEWS
@@ -131,6 +131,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #24705: Fix sysconfig._parse_makefile not expanding ${} vars
+  appearing before $() vars.
+
 - Issue #26069: Remove the deprecated apis in the trace module.
 
 - Issue #22138: Fix mock.patch behavior when patching descriptors. Restore