# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 2014-07-06 19:39:01
# Node ID 0c88185c7d6c4718a1444b7635280a95f98f7e2c
# Parent  61b333b982ea7baab198a188306fc05fb2850179
# Parent  f266be73f764120e50468e7f176a1bc904cded3d

Merge with stable.

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -534,7 +534,7 @@ if sys.platform == 'darwin' and os.path.
     # 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')