diff options
| author | Robert Guo <robert.guo@10gen.com> | 2022-02-04 09:40:55 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-02-04 15:40:17 +0000 |
| commit | 6030a892a8b4ea5543ceb9048641ecdaf78b3cb8 (patch) | |
| tree | 13e91fc392ae4969cf67669f70d6a701b8ef2fb4 /SConstruct | |
| parent | 3f0788882675f8e4893a9c5ebbcee4716ed436fa (diff) | |
| download | mongo-6030a892a8b4ea5543ceb9048641ecdaf78b3cb8.tar.gz | |
Revert "SERVER-60832 Readd and fix gcov code coverage variant"
This reverts commit bf96dbdca5e9c23cf541cb6f53292a18d837cde5.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index 150ae43b4b5..446b3dea8e0 100644 --- a/SConstruct +++ b/SConstruct @@ -2515,14 +2515,10 @@ if env.TargetOSIs('posix'): if has_option( "gcov" ): if not (env.TargetOSIs('linux') and env.ToolchainIs('gcc')): # TODO: This should become supported under: https://jira.mongodb.org/browse/SERVER-49877 - # TODO SERVER-63055: clang is not supported due to consistent - # failures in ValidateCollections when using gcov. - env.FatalError("Coverage option 'gcov' is currently only supported on linux with gcc. See SERVER-49877 and SERVER-63055.") + env.FatalError("Coverage option 'gcov' is currently only supported on linux with gcc. See SERVER-49877.") - env.AppendUnique( - CCFLAGS=['--coverage'], - LINKFLAGS=['--coverage'], - ) + env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage", "-fprofile-update=single"] ) + env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage", "-fprofile-update=single"] ) if optBuild and not optBuildForSize: env.Append( CCFLAGS=["-O3" if "O3" in selected_experimental_optimizations else "-O2"] ) @@ -2940,9 +2936,6 @@ def doConfigure(myenv): if not AddToLINKFLAGSIfSupported(myenv, f'-fuse-ld={linker_ld}'): myenv.FatalError(f"Linker {linker_ld} could not be configured.") - if has_option('gcov') and AddToCCFLAGSIfSupported(myenv, '-fprofile-update=single'): - myenv.AppendUnique(LINKFLAGS=['-fprofile-update=single']) - detectCompiler = Configure(myenv, help=False, custom_tests = { 'CheckForCXXLink': CheckForCXXLink, }) |