diff options
| author | Andrew Morrow <acm@10gen.com> | 2013-04-24 20:04:27 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@10gen.com> | 2013-04-26 11:08:25 -0400 |
| commit | bc532c817a433d33a9d25d9e48cc1567f303097c (patch) | |
| tree | d40f8bc091127410b0d90e8fd801800d069b5753 /SConstruct | |
| parent | c6a64785eceb702606a18e3910a47fed40e3fe33 (diff) | |
| download | mongo-bc532c817a433d33a9d25d9e48cc1567f303097c.tar.gz | |
Don't suppress configure checks during --clean
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 61911ed5b41..7c8fbbcc93e 100644 --- a/SConstruct +++ b/SConstruct @@ -806,7 +806,7 @@ def doConfigure(myenv): # TODO: Currently, we have some flags already injected. Eventually, this should test the # bare compilers, and we should re-check at the very end that TryCompile and TryLink still # work with the flags we have selected. - conf = Configure(myenv, clean=False, help=False) + conf = Configure(myenv, help=False) if 'CheckCXX' in dir( conf ): if not conf.CheckCXX(): @@ -861,7 +861,7 @@ def doConfigure(myenv): context.Result(result) return result - conf = Configure(myenv, clean=False, help=False, custom_tests = { + conf = Configure(myenv, help=False, custom_tests = { 'CheckForToolchain' : CheckForToolchain, }) @@ -923,7 +923,7 @@ def doConfigure(myenv): context.Result(result) return result - conf = Configure(myenv, clean=False, help=False, custom_tests = { + conf = Configure(myenv, help=False, custom_tests = { 'CheckFor64Bit' : CheckFor64Bit }) if conf.CheckFor64Bit(): @@ -971,7 +971,7 @@ def doConfigure(myenv): # adding -Werror won't hurt. For clang, bad flags are only warnings, so we need -Werror # to make them real errors. cloned.Append(CCFLAGS=['-Werror']) - conf = Configure(cloned, clean=False, help=False, custom_tests = { + conf = Configure(cloned, help=False, custom_tests = { 'CheckFlag' : lambda(ctx) : CheckFlagTest(ctx, tool, extension, flag) }) available = conf.CheckFlag() |