summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-09-06 22:59:08 +0200
committerRémi Verschelde <rverschelde@gmail.com>2022-09-07 08:50:31 +0200
commit22381d9d074f77f4acb700c4d765e44e3f0727f7 (patch)
treeb16d8210ab8711b4cd5921a31d41f2e220893f57 /SConstruct
parent432c4c40a9d29c127a5957944ca8f805dfb836ce (diff)
SCons: Fix compilation database generation with MSVC
Fixes #54434. Co-authored-by: Daniel Moody <daniel.moody@mongodb.com>
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct26
1 files changed, 13 insertions, 13 deletions
diff --git a/SConstruct b/SConstruct
index 5ad4b614ca..ce586010f4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -438,19 +438,6 @@ if selected_platform in platform_list:
)
env.SetOption("num_jobs", safer_cpu_count)
- if env["compiledb"]:
- # Generating the compilation DB (`compile_commands.json`) requires SCons 4.0.0 or later.
- from SCons import __version__ as scons_raw_version
-
- scons_ver = env._get_major_minor_revision(scons_raw_version)
-
- if scons_ver < (4, 0, 0):
- print("The `compiledb=yes` option requires SCons 4.0 or later, but your version is %s." % scons_raw_version)
- Exit(255)
-
- env.Tool("compilation_db")
- env.Alias("compiledb", env.CompilationDatabase())
-
# 'dev' and 'production' are aliases to set default options if they haven't been set
# manually by the user.
if env["dev"]:
@@ -840,6 +827,19 @@ if selected_platform in platform_list:
env.vs_incs = []
env.vs_srcs = []
+ if env["compiledb"]:
+ # Generating the compilation DB (`compile_commands.json`) requires SCons 4.0.0 or later.
+ from SCons import __version__ as scons_raw_version
+
+ scons_ver = env._get_major_minor_revision(scons_raw_version)
+
+ if scons_ver < (4, 0, 0):
+ print("The `compiledb=yes` option requires SCons 4.0 or later, but your version is %s." % scons_raw_version)
+ Exit(255)
+
+ env.Tool("compilation_db")
+ env.Alias("compiledb", env.CompilationDatabase())
+
Export("env")
# Build subdirs, the build order is dependent on link order.