Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build/common_compiler_flags.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ def generate(env):
elif env["optimize"] == "debug":
env.Append(CPPDEFINES=["OPT_DEBUG_ENABLED"])

if env["harden_memory"] == "fast":
env.Append(CPPDEFINES=["_GLIBCXX_ASSERTIONS", ("_LIBCPP_HARDENING_MODE", "_LIBCPP_HARDENING_MODE_FAST"), ("_MSVC_STL_HARDENING", 1)])

# Set optimize and debug_symbols flags.
# "custom" means do nothing and let users set their own optimization flags.
if env.get("is_msvc", False):
Expand Down
15 changes: 15 additions & 0 deletions tools/targets.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ def options(opts):
)
opts.Add(BoolVariable("debug_symbols", "Build with debugging symbols", True))
opts.Add(BoolVariable("dev_build", "Developer build with dev-only debugging code (DEV_ENABLED)", False))
opts.Add(EnumVariable(
"harden_memory",
"Library memory hardening (by default inferred from 'dev_build')",
"auto",
["auto", "none", "fast"],
ignorecase=2
)
)


def exists(env):
Expand Down Expand Up @@ -89,6 +97,13 @@ def generate(env):
opt_level = "speed"
env["optimize"] = ARGUMENTS.get("optimize", opt_level)

if env["harden_memory"] == "auto":
if env.dev_build:
harden_level = "none"
else:
harden_level = "fast"
env["harden_memory"] = ARGUMENTS.get("harden_memory", harden_level)

env["debug_symbols"] = get_cmdline_bool("debug_symbols", env.dev_build)

if env.use_hot_reload:
Expand Down