summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Yasskin <jyasskin@gmail.com>2010-07-09 19:55:05 (GMT)
committerJeffrey Yasskin <jyasskin@gmail.com>2010-07-09 19:55:05 (GMT)
commit61c061a8b39f4d567d7489413b0ef3a2cb50c2fc (patch)
tree4376ede3011536922577637a12f1a526e4cc0409
parentb669221bd1de1343a0a86c851a2d45ba979d19c1 (diff)
downloadcpython-61c061a8b39f4d567d7489413b0ef3a2cb50c2fc.zip
cpython-61c061a8b39f4d567d7489413b0ef3a2cb50c2fc.tar.gz
cpython-61c061a8b39f4d567d7489413b0ef3a2cb50c2fc.tar.bz2
Oops. Fix distutils tests that r82746 broke.
-rw-r--r--Lib/sysconfig.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index d59a682..50c8133 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -262,7 +262,9 @@ def _parse_makefile(filename, vars=None):
# Add in CFLAGS, LDFLAGS, and CPPFLAGS, which are named with a
# prefix in the Makefile.
for var in ('CFLAGS', 'LDFLAGS', 'CPPFLAGS'):
- done[var] = done['PY_' + var]
+ makefile_value = done.get('PY_' + var)
+ if makefile_value is not None:
+ done[var] = makefile_value
# save the results in the global dictionary
vars.update(done)