changeset:   99854:ef84d21f5292
branch:      3.5
parent:      99848:e79eddcdff63
user:        doko@ubuntu.com
date:        Mon Jan 11 21:41:40 2016 +0100
files:       Lib/sysconfig.py Misc/NEWS
description:
- Issue #24705: Fix sysconfig._parse_makefile not expanding ${} vars
  appearing before $() vars.


diff -r e79eddcdff63 -r ef84d21f5292 Lib/sysconfig.py
--- a/Lib/sysconfig.py	Mon Jan 11 13:24:02 2016 -0500
+++ b/Lib/sysconfig.py	Mon Jan 11 21:41:40 2016 +0100
@@ -260,7 +260,12 @@
     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 -r e79eddcdff63 -r ef84d21f5292 Misc/NEWS
--- a/Misc/NEWS	Mon Jan 11 13:24:02 2016 -0500
+++ b/Misc/NEWS	Mon Jan 11 21:41:40 2016 +0100
@@ -44,6 +44,9 @@
 Library
 -------
 
+- Issue #24705: Fix sysconfig._parse_makefile not expanding ${} vars
+  appearing before $() vars.
+
 - Issue #22138: Fix mock.patch behavior when patching descriptors. Restore
   original values after patching. Patch contributed by Sean McCully.