From 82e662096cb2f903cc6ff7e5ea5b2ea8330cc195 Mon Sep 17 00:00:00 2001 From: Pratyush Das Date: Tue, 24 Dec 2019 18:04:20 +0530 Subject: [PATCH] Enable tarball-tag flag to build cling using LLVM binary release. Fixes Cling's nightly releases --- tools/packaging/cpt.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/packaging/cpt.py b/tools/packaging/cpt.py index 6b813d6d..da709684 100755 --- a/tools/packaging/cpt.py +++ b/tools/packaging/cpt.py @@ -2437,8 +2437,14 @@ if args['tarball_tag']: "https://raw.githubusercontent.com/root-project/cling/%s/LastKnownGoodLLVMSVNRevision.txt" % args[ 'tarball_tag']).readline().strip().decode( 'utf-8') - fetch_llvm(llvm_revision) - fetch_clang(llvm_revision) + if is_llvm_binary_compatible() and args["with_binary_llvm"]: + compile = compile_for_binary + install_prefix = install_prefix_for_binary + fetch_clang(llvm_revision) + allow_clang_tool() + else: + fetch_llvm(llvm_revision) + fetch_clang(llvm_revision) fetch_cling(args['tarball_tag']) set_version() @@ -2455,6 +2461,8 @@ if args['tarball_tag']: install_prefix() if not args['no_test']: + if is_llvm_binary_compatible() and args['with_binary_llvm']: + build_filecheck() test_cling() tarball() cleanup()