diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-12-12 15:16:35 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-12-12 15:00:52 +0000 |
| commit | c1d563d6ff05af47bc968ee151b76887070ba21b (patch) | |
| tree | bb170403c4885c3cc040226282ee9cea6310e2ab /packaging-tools/build_clang_qdoc.py | |
| parent | c33f6b89d471633dc8f994d529a71d9a69b22ac8 (diff) | |
Prospective build fix
The patch_src_path variable is None, so passing that to os.path.join
doesn't work. The resulting qtcreator_path variable however is only used
for "training", which we don't need for qdoc's clang.
Change-Id: I9e00c4dac7d5810e005d3d9ff7bbef647c57ff95
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'packaging-tools/build_clang_qdoc.py')
| -rw-r--r-- | packaging-tools/build_clang_qdoc.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/packaging-tools/build_clang_qdoc.py b/packaging-tools/build_clang_qdoc.py index 880cc5398..393212e6b 100644 --- a/packaging-tools/build_clang_qdoc.py +++ b/packaging-tools/build_clang_qdoc.py @@ -462,13 +462,11 @@ def main(): else: print 'CLANG_PATCHES: Not set, skipping.' - qtcreator_path = os.path.abspath(os.path.join(patch_src_path, '..', '..', '..')) # TODO: put args in some struct to improve readability, add error checks build_clang(toolchain, src_path, build_path, install_path, profile_data_path, True, bitness, environment, build_type='Release') if is_mingw_toolchain(toolchain): shutil.rmtree(profile_data_path) os.makedirs(profile_data_path) - mingw_training(base_path, qtcreator_path, bitness) build_clang(toolchain, src_path, build_path, install_path, profile_data_path, False, bitness, environment, build_type='Release') check_clang(toolchain, build_path, environment) |