diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-08-13 09:59:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 09:59:33 +0200 |
| commit | 58ffd9c6d8ad2b41da45c9c6dca304528a9e4e9f (patch) | |
| tree | 1b944f1a1d3ca0482854e7474bc9147ae3de5320 /SConstruct | |
| parent | 9413446b2d942402491254feae549e85740692a9 (diff) | |
| parent | 974a4cde9ddd6e656e7cf85e47002917d1410d22 (diff) | |
Merge pull request #41206 from RevoluPowered/use_scons_compile_database
Scons 4.0.0 - use the compile db tool provided by the upstream scons
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 96d2f1abe7..04fe07cb7b 100644 --- a/SConstruct +++ b/SConstruct @@ -310,9 +310,10 @@ if selected_platform in platform_list: from SCons import __version__ as scons_raw_version scons_ver = env._get_major_minor_revision(scons_raw_version) - if scons_ver >= (3, 1, 1): - env.Tool("compilation_db", toolpath=["misc/scons"]) - env.Alias("compiledb", env.CompilationDatabase("compile_commands.json")) + + if scons_ver >= (4, 0, 0): + env.Tool("compilation_db") + env.Alias("compiledb", env.CompilationDatabase()) if env["dev"]: env["verbose"] = True |