From 42d3d9c345bfc867620f0f2db67ed2aadddfaf8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 8 Feb 2021 08:52:21 +0100 Subject: [PATCH] SCons: Fix debug_symbols tests after switch to BoolVariable Bug introduced in #45679. Fixes part of #45816. (cherry picked from commit 849c090343a22b98f0c977f2bb3469f709688de4) Also removes useless `debug_symbols=full` mode. --- platform/osx/SCsub | 2 +- platform/osx/detect.py | 26 ++++++++++++-------------- platform/server/detect.py | 4 ++-- platform/windows/SCsub | 2 +- platform/windows/detect.py | 25 +++++++++++-------------- platform/x11/SCsub | 2 +- platform/x11/detect.py | 22 ++++++++++------------ 7 files changed, 38 insertions(+), 45 deletions(-) diff --git a/platform/osx/SCsub b/platform/osx/SCsub index 4da35259f49..cd9b5d59b90 100644 --- a/platform/osx/SCsub +++ b/platform/osx/SCsub @@ -17,5 +17,5 @@ files = [ prog = env.add_program("#bin/godot", files) -if env["debug_symbols"] == "yes" and env["separate_debug_symbols"]: +if env["debug_symbols"] and env["separate_debug_symbols"]: env.AddPostAction(prog, run_in_subprocess(platform_osx_builders.make_debug_osx)) diff --git a/platform/osx/detect.py b/platform/osx/detect.py index a1c20b834a0..ea2189c031c 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -41,27 +41,25 @@ def configure(env): ## Build type if env["target"] == "release": - if env["debug_symbols"] != "full": - if env["optimize"] == "speed": # optimize for speed (default) - env.Prepend(CCFLAGS=["-O3", "-fomit-frame-pointer", "-ftree-vectorize"]) - else: # optimize for size - env.Prepend(CCFLAGS=["-Os", "-ftree-vectorize"]) - if env["arch"] != "arm64": - env.Prepend(CCFLAGS=["-msse2"]) + if env["optimize"] == "speed": # optimize for speed (default) + env.Prepend(CCFLAGS=["-O3", "-fomit-frame-pointer", "-ftree-vectorize"]) + else: # optimize for size + env.Prepend(CCFLAGS=["-Os", "-ftree-vectorize"]) + if env["arch"] != "arm64": + env.Prepend(CCFLAGS=["-msse2"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.Prepend(CCFLAGS=["-g2"]) elif env["target"] == "release_debug": - if env["debug_symbols"] != "full": - if env["optimize"] == "speed": # optimize for speed (default) - env.Prepend(CCFLAGS=["-O2"]) - else: # optimize for size - env.Prepend(CCFLAGS=["-Os"]) + if env["optimize"] == "speed": # optimize for speed (default) + env.Prepend(CCFLAGS=["-O2"]) + else: # optimize for size + env.Prepend(CCFLAGS=["-Os"]) env.Prepend(CPPDEFINES=["DEBUG_ENABLED"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.Prepend(CCFLAGS=["-g2"]) elif env["target"] == "debug": diff --git a/platform/server/detect.py b/platform/server/detect.py index bf998013699..8272b5e39d3 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -57,7 +57,7 @@ def configure(env): else: # optimize for size env.Prepend(CCFLAGS=["-Os"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.Prepend(CCFLAGS=["-g2"]) elif env["target"] == "release_debug": @@ -67,7 +67,7 @@ def configure(env): env.Prepend(CCFLAGS=["-Os"]) env.Prepend(CPPDEFINES=["DEBUG_ENABLED"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.Prepend(CCFLAGS=["-g2"]) elif env["target"] == "debug": diff --git a/platform/windows/SCsub b/platform/windows/SCsub index 5cfaa696289..439a91e21f0 100644 --- a/platform/windows/SCsub +++ b/platform/windows/SCsub @@ -31,5 +31,5 @@ if env["vsproj"]: env.vs_srcs += ["platform/windows/" + str(x)] if not os.getenv("VCINSTALLDIR"): - if env["debug_symbols"] == "yes" and env["separate_debug_symbols"]: + if env["debug_symbols"] and env["separate_debug_symbols"]: env.AddPostAction(prog, run_in_subprocess(platform_windows_builders.make_debug_mingw)) diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 265f7178600..c9facb2261f 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -176,21 +176,19 @@ def configure_msvc(env, manual_msvc_config): # Build type if env["target"] == "release": - if env["debug_symbols"] != "full": - if env["optimize"] == "speed": # optimize for speed (default) - env.Append(CCFLAGS=["/O2"]) - else: # optimize for size - env.Append(CCFLAGS=["/O1"]) + if env["optimize"] == "speed": # optimize for speed (default) + env.Append(CCFLAGS=["/O2"]) + else: # optimize for size + env.Append(CCFLAGS=["/O1"]) env.Append(LINKFLAGS=["/SUBSYSTEM:WINDOWS"]) env.Append(LINKFLAGS=["/ENTRY:mainCRTStartup"]) env.Append(LINKFLAGS=["/OPT:REF"]) elif env["target"] == "release_debug": - if env["debug_symbols"] != "full": - if env["optimize"] == "speed": # optimize for speed (default) - env.Append(CCFLAGS=["/O2"]) - else: # optimize for size - env.Append(CCFLAGS=["/O1"]) + if env["optimize"] == "speed": # optimize for speed (default) + env.Append(CCFLAGS=["/O2"]) + else: # optimize for size + env.Append(CCFLAGS=["/O1"]) env.AppendUnique(CPPDEFINES=["DEBUG_ENABLED"]) env.Append(LINKFLAGS=["/SUBSYSTEM:CONSOLE"]) env.Append(LINKFLAGS=["/OPT:REF"]) @@ -201,7 +199,7 @@ def configure_msvc(env, manual_msvc_config): env.Append(LINKFLAGS=["/SUBSYSTEM:CONSOLE"]) env.Append(LINKFLAGS=["/DEBUG"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.AppendUnique(CCFLAGS=["/Z7"]) env.AppendUnique(LINKFLAGS=["/DEBUG"]) @@ -308,16 +306,15 @@ def configure_mingw(env): env.Append(CCFLAGS=["-O2"]) else: # optimize for size env.Prepend(CCFLAGS=["-Os"]) - env.Append(LINKFLAGS=["-Wl,--subsystem,windows"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.Prepend(CCFLAGS=["-g2"]) elif env["target"] == "release_debug": env.Append(CCFLAGS=["-O2"]) env.Append(CPPDEFINES=["DEBUG_ENABLED"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.Prepend(CCFLAGS=["-g2"]) if env["optimize"] == "speed": # optimize for speed (default) env.Append(CCFLAGS=["-O2"]) diff --git a/platform/x11/SCsub b/platform/x11/SCsub index a48ce586847..f01efdbee25 100644 --- a/platform/x11/SCsub +++ b/platform/x11/SCsub @@ -17,5 +17,5 @@ common_x11 = [ prog = env.add_program("#bin/godot", ["godot_x11.cpp"] + common_x11) -if env["debug_symbols"] == "yes" and env["separate_debug_symbols"]: +if env["debug_symbols"] and env["separate_debug_symbols"]: env.AddPostAction(prog, run_in_subprocess(platform_x11_builders.make_debug_x11)) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index e670791d2fd..5da9b715e67 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -87,25 +87,23 @@ def configure(env): ## Build type if env["target"] == "release": - if env["debug_symbols"] != "full": - if env["optimize"] == "speed": # optimize for speed (default) - env.Prepend(CCFLAGS=["-O3"]) - else: # optimize for size - env.Prepend(CCFLAGS=["-Os"]) + if env["optimize"] == "speed": # optimize for speed (default) + env.Prepend(CCFLAGS=["-O3"]) + else: # optimize for size + env.Prepend(CCFLAGS=["-Os"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.Prepend(CCFLAGS=["-g2"]) elif env["target"] == "release_debug": - if env["debug_symbols"] != "full": - if env["optimize"] == "speed": # optimize for speed (default) - env.Prepend(CCFLAGS=["-O2"]) - else: # optimize for size - env.Prepend(CCFLAGS=["-Os"]) + if env["optimize"] == "speed": # optimize for speed (default) + env.Prepend(CCFLAGS=["-O2"]) + else: # optimize for size + env.Prepend(CCFLAGS=["-Os"]) env.Prepend(CPPDEFINES=["DEBUG_ENABLED"]) - if env["debug_symbols"] == "yes": + if env["debug_symbols"]: env.Prepend(CCFLAGS=["-g2"]) elif env["target"] == "debug":