This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8327

setup: relax -Werror for declaration-after-statement on Python 3.9
ClosedPublic

Authored by durin42 on Mar 25 2020, 12:12 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG960770add699: setup: relax -Werror for declaration-after-statement on Python 3.9
Summary

It turns out Python 3.9 introduces such declarations in the headers, eg

cpython/abstract.h:189:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]

so we have to be more relaxed when compiling for 3.9.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Msetup.py (5 lines)

Diff 20890

setup.py

'mercurial/bitmanipulation.h', 'mercurial/bitmanipulation.h',
'mercurial/compat.h', 'mercurial/compat.h',
'mercurial/cext/util.h', 'mercurial/cext/util.h',
] ]
common_include_dirs = ['mercurial'] common_include_dirs = ['mercurial']
common_cflags = [] common_cflags = []
# MSVC 2008 still needs declarations at the top of the scope. # MSVC 2008 still needs declarations at the top of the scope, but Python 3.9
if os.name != 'nt': # makes declarations not at the top of a scope in the headers.
if os.name != 'nt' and sys.version_info[1] < 9:
common_cflags = ['-Werror=declaration-after-statement'] common_cflags = ['-Werror=declaration-after-statement']
osutil_cflags = [] osutil_cflags = []
osutil_ldflags = [] osutil_ldflags = []
# platform specific macros # platform specific macros
for plat, func in [('bsd', 'setproctitle')]: for plat, func in [('bsd', 'setproctitle')]:
if re.search(plat, sys.platform) and hasfunction(new_compiler(), func): if re.search(plat, sys.platform) and hasfunction(new_compiler(), func):