diff options
| -rw-r--r-- | SConstruct | 3 | ||||
| -rw-r--r-- | site_scons/site_tools/ninja.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 8cb6eafa7d0..5291c9521e6 100644 --- a/SConstruct +++ b/SConstruct @@ -5354,6 +5354,9 @@ env.AddMethod(injectModule, 'InjectModule') if get_option('ninja') == 'disabled': compileCommands = env.CompilationDatabase('compile_commands.json') + # Initialize generated-sources Alias as a placeholder so that it can be used as a + # dependency for compileCommands. This Alias will be properly updated in other SConscripts. + env.Requires(compileCommands, env.Alias("generated-sources")) compileDb = env.Alias("compiledb", compileCommands) diff --git a/site_scons/site_tools/ninja.py b/site_scons/site_tools/ninja.py index 0b0d3ed88bf..27b59a69538 100644 --- a/site_scons/site_tools/ninja.py +++ b/site_scons/site_tools/ninja.py @@ -876,6 +876,7 @@ class NinjaState: ninja_file, '-x ' if self.env.get('NINJA_COMPDB_EXPAND') else '' ) }, + order_only=[generated_sources_alias], ) ninja.build( |