diff options
| author | Konstantin Trushin <konstantin.trushin@percona.com> | 2022-06-21 08:12:58 +0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-07-14 21:42:16 +0000 |
| commit | e382f48fc03c6bcc5bb89188721812b101a8d6e6 (patch) | |
| tree | 1dfb45feba47a5f7614f43c774e4b445eae74418 | |
| parent | 42dee378c0dca21d822ccf11cd8d510d9189aeb8 (diff) | |
| download | mongo-e382f48fc03c6bcc5bb89188721812b101a8d6e6.tar.gz | |
SERVER-67398: Fix the build with the legacy install mode
Closes https://github.com/mongodb/mongo/pull/1472
Signed-off-by: Ryan Egesdahl <ryan.egesdahl@mongodb.com>
| -rw-r--r-- | src/mongo/resmoke/SConscript | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/mongo/resmoke/SConscript b/src/mongo/resmoke/SConscript index fb80ab1a713..df55dda54e5 100644 --- a/src/mongo/resmoke/SConscript +++ b/src/mongo/resmoke/SConscript @@ -2,6 +2,7 @@ import os import SCons Import('env') +Import("get_option") env = env.Clone() @@ -13,16 +14,18 @@ resmoke_py = env.Substfile( '@install_dir@': install_dir, } ) -resmoke_py_install = env.AutoInstall( - '$PREFIX_BINDIR', - source=resmoke_py, - AIB_COMPONENT='common', - AIB_ROLE='runtime', -) -# TODO SERVER-61013: We shouldn't have to setattr this once AutoInstall is a -# real builder -setattr(resmoke_py_install[0].attributes, 'AIB_NO_ARCHIVE', True) -env.AddPostAction( - resmoke_py_install, - action=SCons.Defaults.Chmod('$TARGET', "u+x"), -) + +if get_option('install-mode') == 'hygienic': + resmoke_py_install = env.AutoInstall( + '$PREFIX_BINDIR', + source=resmoke_py, + AIB_COMPONENT='common', + AIB_ROLE='runtime', + ) + # TODO SERVER-61013: We shouldn't have to setattr this once AutoInstall is a + # real builder + setattr(resmoke_py_install[0].attributes, 'AIB_NO_ARCHIVE', True) + env.AddPostAction( + resmoke_py_install, + action=SCons.Defaults.Chmod('$TARGET', "u+x"), + ) |