1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00

collect_and_build_with_pgo.py: adapt to monorepo

Differential Revision: https://reviews.llvm.org/D92328
This commit is contained in:
Kristof Beyls 2020-11-30 13:43:44 +01:00
parent 950e7e96bb
commit 27280e2609

View File

@ -146,9 +146,9 @@ class Env:
def has_llvm_subproject(self, name): def has_llvm_subproject(self, name):
if name == 'compiler-rt': if name == 'compiler-rt':
subdir = 'projects/compiler-rt' subdir = '../compiler-rt'
elif name == 'clang': elif name == 'clang':
subdir = 'tools/clang' subdir = '../clang'
else: else:
raise ValueError('Unknown subproject: %s' % name) raise ValueError('Unknown subproject: %s' % name)
@ -161,9 +161,8 @@ class Env:
cwd=None, cwd=None,
check=False, check=False,
silent_unless_error=False): silent_unless_error=False):
cmd_str = ' '.join(shlex.quote(s) for s in cmd)
print( print(
'Running `%s` in %s' % (cmd_str, shlex.quote(cwd or os.getcwd()))) 'Running `%s` in %s' % (cmd, shlex.quote(cwd or os.getcwd())))
if self.dry_run: if self.dry_run:
return return
@ -372,7 +371,8 @@ def _parse_args():
else: else:
output_dir = os.path.abspath(args.out_dir) output_dir = os.path.abspath(args.out_dir)
extra_args = {'CMAKE_BUILD_TYPE': 'Release'} extra_args = {'CMAKE_BUILD_TYPE': 'Release',
'LLVM_ENABLE_PROJECTS': 'clang;compiler-rt;lld'}
for arg in args.cmake_extra_arg: for arg in args.cmake_extra_arg:
if arg.startswith('-D'): if arg.startswith('-D'):
arg = arg[2:] arg = arg[2:]