Merge with stable.

This commit is contained in:
Augie Fackler 2014-07-06 15:39:01 -04:00
commit ea755c45b4

View File

@ -534,7 +534,7 @@ if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
# 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')