Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable.
authorAugie Fackler <raf@durin42.com>
Sun, 06 Jul 2014 15:39:01 -0400
changeset 21840 0c88185c7d6c
parent 21837 61b333b982ea (current diff)
parent 21839 f266be73f764 (diff)
child 21841 521355a95636
Merge with stable.
setup.py file | annotate | diff | comparison | revisions 
--- 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')
Mercurial