mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
setup: fix debug native builds
Summary: Building in debug mode was failing because python emits some warning about some define needing to only be used in opt builds. Since we have -Werror, this gets treated like an error. Let's not use -Werror in debug builds. Test Plan: hg purge --all && FB_HGEXT_CDEBUG=1 python setup.py build --component cstore Reviewers: #mercurial, simonfar Reviewed By: simonfar Subscribers: simonfar, mjpieters Differential Revision: https://phabricator.intern.facebook.com/D4552872 Signature: t1:4552872:1487075732:35b639bc0abd0b2d70b8e0dedd83f35c26396b10
This commit is contained in:
parent
41486c3f47
commit
06360a2b99
22
setup.py
22
setup.py
@ -24,13 +24,15 @@ for i, arg in enumerate(sys.argv):
|
|||||||
|
|
||||||
sys.argv = args
|
sys.argv = args
|
||||||
|
|
||||||
|
cflags = []
|
||||||
|
|
||||||
# if this is set, compile all C extensions with -O0 -g for easy debugging. note
|
# if this is set, compile all C extensions with -O0 -g for easy debugging. note
|
||||||
# that this is not manifested in any way in the Makefile dependencies.
|
# that this is not manifested in any way in the Makefile dependencies.
|
||||||
# therefore, if you already have build products, they won't be rebuilt!
|
# therefore, if you already have build products, they won't be rebuilt!
|
||||||
if os.getenv('FB_HGEXT_CDEBUG') is not None:
|
if os.getenv('FB_HGEXT_CDEBUG') is not None:
|
||||||
cdebugflags = ["-O0", "-g"]
|
cflags.extend(["-O0", "-g"])
|
||||||
else:
|
else:
|
||||||
cdebugflags = []
|
cflags.append("-Werror")
|
||||||
|
|
||||||
def get_env_path_list(var_name, default=None):
|
def get_env_path_list(var_name, default=None):
|
||||||
'''Get a path list from an environment variable. The variable is parsed as
|
'''Get a path list from an environment variable. The variable is parsed as
|
||||||
@ -115,8 +117,8 @@ else:
|
|||||||
extra_compile_args=[
|
extra_compile_args=[
|
||||||
"-std=c99",
|
"-std=c99",
|
||||||
"-Wall",
|
"-Wall",
|
||||||
"-Werror", "-Werror=strict-prototypes",
|
"-Werror=strict-prototypes",
|
||||||
] + cdebugflags,
|
] + cflags,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
'cstore' : [
|
'cstore' : [
|
||||||
@ -139,8 +141,7 @@ else:
|
|||||||
extra_compile_args=[
|
extra_compile_args=[
|
||||||
"-std=c++0x",
|
"-std=c++0x",
|
||||||
"-Wall",
|
"-Wall",
|
||||||
"-Werror",
|
] + cflags,
|
||||||
] + cdebugflags,
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
'ctreemanifest' : [
|
'ctreemanifest' : [
|
||||||
@ -163,8 +164,7 @@ else:
|
|||||||
extra_compile_args=[
|
extra_compile_args=[
|
||||||
"-std=c++0x",
|
"-std=c++0x",
|
||||||
"-Wall",
|
"-Wall",
|
||||||
"-Werror",
|
] + cflags,
|
||||||
] + cdebugflags,
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
'cfastmanifest' : [
|
'cfastmanifest' : [
|
||||||
@ -193,8 +193,8 @@ else:
|
|||||||
extra_compile_args=[
|
extra_compile_args=[
|
||||||
"-std=c99",
|
"-std=c99",
|
||||||
"-Wall",
|
"-Wall",
|
||||||
"-Werror", "-Werror=strict-prototypes",
|
"-Werror=strict-prototypes",
|
||||||
] + cdebugflags,
|
] + cflags,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
'linelog' : [
|
'linelog' : [
|
||||||
@ -203,7 +203,7 @@ else:
|
|||||||
extra_compile_args=[
|
extra_compile_args=[
|
||||||
'-std=c99',
|
'-std=c99',
|
||||||
'-Wall', '-Wextra', '-Wconversion', '-pedantic',
|
'-Wall', '-Wextra', '-Wconversion', '-pedantic',
|
||||||
] + cdebugflags,
|
] + cflags,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user