diff options
| author | Tausif Rahman <tausif.rahman@mongodb.com> | 2022-08-22 22:11:38 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-08-24 20:39:11 +0000 |
| commit | 786c9cb305ad36b6c0e9ee6ac572e7e050fc6cf9 (patch) | |
| tree | 96dcc7c17cdcdcaee8403a58553fa3b0c50db355 | |
| parent | edce02c5c24d122bf0688dcbae3d5ff699bd21bd (diff) | |
| download | mongo-786c9cb305ad36b6c0e9ee6ac572e7e050fc6cf9.tar.gz | |
SERVER-68586 Use opt setting from Build Profiles
(cherry picked from commit cfbd8f84498a748e81a904b44f5c16328b957e0c)
| -rwxr-xr-x | SConstruct | 5 | ||||
| -rw-r--r-- | site_scons/mongo/build_profiles.py | 2 | ||||
| -rw-r--r-- | site_scons/mongo/generators.py | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 0f33eec2929..1a611f4daab 100755 --- a/SConstruct +++ b/SConstruct @@ -284,8 +284,9 @@ add_option('spider-monkey-dbg', ) add_option('opt', - choices=['on', 'size', 'off'], + choices=['on', 'size', 'off', 'auto'], const='on', + default=build_profile.opt, help='Enable compile-time optimization', nargs='?', type='choice', @@ -1184,6 +1185,8 @@ dbg_opt_mapping = { ( "off", "off" ) : ( False, False ), ( "on", "size" ) : ( True, True ), ( "off", "size" ) : ( False, True ), + ( "on", "auto" ) : ( True, False ), + ( "off", "auto" ) : ( False, True ), } debugBuild, optBuild = dbg_opt_mapping[(get_option('dbg'), get_option('opt'))] optBuildForSize = True if optBuild and get_option('opt') == "size" else False diff --git a/site_scons/mongo/build_profiles.py b/site_scons/mongo/build_profiles.py index 122d859cd22..8ab85883067 100644 --- a/site_scons/mongo/build_profiles.py +++ b/site_scons/mongo/build_profiles.py @@ -29,7 +29,7 @@ BUILD_PROFILES = { sanitize=None, link_model="auto", dbg="off", - opt="off", + opt="auto", ICECC=None, CCACHE=None, NINJA_PREFIX="build", diff --git a/site_scons/mongo/generators.py b/site_scons/mongo/generators.py index e2b401a5eae..415486587f1 100644 --- a/site_scons/mongo/generators.py +++ b/site_scons/mongo/generators.py @@ -88,6 +88,7 @@ def empty_buildinfo_environment_data(): return {} +# TODO: SERVER-69064 Improve default_variant_dir_generator in Build System def default_variant_dir_generator(target, source, env, for_signature): if env.GetOption('cache') != None: |