revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

.

Browse source
This commit is contained in:
Mikhail Goncharov 2021-06-28 15:55:15 +02:00
parent 9939a0f29d
commit 349371a671
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/run_cmake.py
View file

@ -106,10 +106,10 @@ def _create_env(config: Configuration) -> Dict[str, str]:
return env return env
def _create_args(config: Configuration, llvm_enable_projects: str, use_cache: bool) -> List[str]: def _create_args(config: Configuration, llvm_enable_projects: str, use_cache: bool, repo_path: str) -> List[str]:
"""Generate the command line arguments for cmake.""" """Generate the command line arguments for cmake."""
arguments = [ arguments = [
os.path.join('..', 'llvm'), os.path.join(repo_path, 'llvm'),
'-D LLVM_ENABLE_PROJECTS="{}"'.format(llvm_enable_projects), '-D LLVM_ENABLE_PROJECTS="{}"'.format(llvm_enable_projects),
] ]
arguments.extend(config.general_cmake_arguments) arguments.extend(config.general_cmake_arguments)
@ -165,7 +165,7 @@ def run(projects: str, repo_path: str, config_file_path: str = None, *, dry_run:
env = _create_env(config) env = _create_env(config)
llvm_enable_projects = _select_projects(config, projects, repo_path) llvm_enable_projects = _select_projects(config, projects, repo_path)
print('Enabled projects: {}'.format(llvm_enable_projects), flush=True) print('Enabled projects: {}'.format(llvm_enable_projects), flush=True)
arguments = _create_args(config, llvm_enable_projects, True) arguments = _create_args(config, llvm_enable_projects, True, repo_path)
cmd = 'cmake ' + ' '.join(arguments) cmd = 'cmake ' + ' '.join(arguments)
print('Running cmake with these arguments:\n{}'.format(cmd), flush=True) print('Running cmake with these arguments:\n{}'.format(cmd), flush=True)
@ -173,7 +173,7 @@ def run(projects: str, repo_path: str, config_file_path: str = None, *, dry_run:
print('Dry run, not invoking CMake!') print('Dry run, not invoking CMake!')
return 0, build_dir, [], [] return 0, build_dir, [], []
result = subprocess.call(cmd, env=env, shell=True, cwd=build_dir) result = subprocess.call(cmd, env=env, shell=True, cwd=build_dir)
commands.append('cmake ' + ' '.join(_create_args(config, llvm_enable_projects, False))) commands.append('cmake ' + ' '.join(_create_args(config, llvm_enable_projects, False, repo_path)))
commands.append('# ^note that compiler cache arguments are omitted') commands.append('# ^note that compiler cache arguments are omitted')
_link_compile_commands(config, repo_path, build_dir, commands) _link_compile_commands(config, repo_path, build_dir, commands)
return result, build_dir, [os.path.join(build_dir, 'CMakeCache.txt')], commands return result, build_dir, [os.path.join(build_dir, 'CMakeCache.txt')], commands