changeset 21840:0c88185c7d6c

Merge with stable.
author Augie Fackler <raf@durin42.com>
date Sun, 06 Jul 2014 15:39:01 -0400
parents 61b333b982ea (current diff) f266be73f764 (diff)
children 521355a95636
files setup.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/setup.py	Fri Jun 13 15:59:18 2014 -0700
+++ b/setup.py	Sun Jul 06 15:39:01 2014 -0400
@@ -534,7 +534,7 @@
     # so Mercurial can continue to compile in the meantime.
     if xcode51:
         cflags = get_config_var('CFLAGS')
-        if re.search(r'-mno-fused-madd\b', cflags) is not None:
+        if cflags and re.search(r'-mno-fused-madd\b', cflags) is not None:
             os.environ['CFLAGS'] = (
                 os.environ.get('CFLAGS', '') + ' -Qunused-arguments')