diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-06-12 14:52:53 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-06-12 13:03:52 +0000 |
| commit | 91457e585efffedc6c7e7d7a5ad9ecade06b07ed (patch) | |
| tree | 36e83026e87213e0bbe7ea93f742966c3b253f78 | |
| parent | 8b55bfe7394a982ea70c8419fe90ca60cc1f3c06 (diff) | |
build_clang.py: Fix checking out submodule
The '--recursive' had no effect since '--no-checkout' was also provided.
Change-Id: I32980b96cfc2e8c269f5d5221025da09a6447427
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| -rw-r--r-- | packaging-tools/build_clang.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packaging-tools/build_clang.py b/packaging-tools/build_clang.py index cca86d872..1ad09a7a9 100644 --- a/packaging-tools/build_clang.py +++ b/packaging-tools/build_clang.py @@ -54,11 +54,12 @@ import threadedwork import multiprocessing def git_clone_and_checkout(base_path, remote_repository_url, directory, revision): - bld_utils.runCommand(['git', 'clone', '--no-checkout', '--recursive', remote_repository_url, directory], base_path) - local_repo_path = os.path.join(base_path, directory) - bld_utils.runCommand(['git', 'config', 'core.eol', 'lf'], local_repo_path) - bld_utils.runCommand(['git', 'config', 'core.autocrlf', 'input'], local_repo_path) - bld_utils.runCommand(['git', 'checkout', revision], local_repo_path) + bld_utils.runCommand(['git', 'clone', + '--config', 'core.eol=lf', + '--config', 'core.autocrlf=input', + '--branch', revision, + '--recursive', + remote_repository_url, directory], base_path) def get_clang(base_path, llvm_revision): git_clone_and_checkout(base_path, 'git://code.qt.io/clang/llvm-project.git', 'llvm', llvm_revision) |