diff options
| author | Andrew Morrow <acm@mongodb.com> | 2020-07-31 15:56:20 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-03 17:18:57 +0000 |
| commit | 506a0af7f80b37fa0c0d864c848e6e4b8d02fb35 (patch) | |
| tree | 460a9693f55471f590f46c34bfd5f767b573108e /SConstruct | |
| parent | 5dbb79146a7f1b0770a7d3f65e5e9079229f593f (diff) | |
| download | mongo-506a0af7f80b37fa0c0d864c848e6e4b8d02fb35.tar.gz | |
SERVER-50043 Remove Framework build vestiges from embedded
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/SConstruct b/SConstruct index 91163aeaafb..29ff508d9e5 100644 --- a/SConstruct +++ b/SConstruct @@ -3684,28 +3684,6 @@ def doConfigure(myenv): conf.AddTest('CheckMongoCMinVersion', CheckMongoCMinVersion) - if env.TargetOSIs('darwin'): - def CheckMongoCFramework(context): - context.Message("Checking for mongoc_get_major_version() in darwin framework mongoc...") - test_body = """ - #include <mongoc/mongoc.h> - - int main() { - mongoc_get_major_version(); - - return EXIT_SUCCESS; - } - """ - - lastFRAMEWORKS = context.env['FRAMEWORKS'] - context.env.Append(FRAMEWORKS=['mongoc']) - result = context.TryLink(textwrap.dedent(test_body), ".c") - context.Result(result) - context.env['FRAMEWORKS'] = lastFRAMEWORKS - return result - - conf.AddTest('CheckMongoCFramework', CheckMongoCFramework) - mongoc_mode = get_option('use-system-mongo-c') conf.env['MONGO_HAVE_LIBMONGOC'] = False if mongoc_mode != 'off': @@ -3715,9 +3693,7 @@ def doConfigure(myenv): "C", "mongoc_get_major_version();", autoadd=False ): - conf.env['MONGO_HAVE_LIBMONGOC'] = "library" - if not conf.env['MONGO_HAVE_LIBMONGOC'] and env.TargetOSIs('darwin') and conf.CheckMongoCFramework(): - conf.env['MONGO_HAVE_LIBMONGOC'] = "framework" + conf.env['MONGO_HAVE_LIBMONGOC'] = True if not conf.env['MONGO_HAVE_LIBMONGOC'] and mongoc_mode == 'on': myenv.ConfError("Failed to find the required C driver headers") if conf.env['MONGO_HAVE_LIBMONGOC'] and not conf.CheckMongoCMinVersion(): |