From 331ab236e7e4cadfa06981879563e89a1d156d63 Mon Sep 17 00:00:00 2001 From: Yonghong Song Date: Sun, 14 Oct 2018 22:51:40 -0700 Subject: [PATCH] fix bcc build failure with latest llvm/clang trunk The clang commit commit 247be3e41c41201641af01888ff0d84484c4e0f4 Author: Simon Pilgrim Date: Fri Oct 12 19:14:43 2018 +0000 Fix a clang::driver::ArgStringList usage I missed in rL344398. NFCI. removed using ArgStringList = llvm::opt::ArgStringList; in clang:include/clang/Driver/Job.h, and makes bcc compilation failure. Using llvm::opt::ArgStringList fixed the issue and should still work with previous llvm versions. Signed-off-by: Yonghong Song --- src/cc/frontends/clang/loader.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cc/frontends/clang/loader.cc b/src/cc/frontends/clang/loader.cc index 3596bd643d93..f461ded0b8c6 100755 --- a/src/cc/frontends/clang/loader.cc +++ b/src/cc/frontends/clang/loader.cc @@ -306,7 +306,7 @@ int ClangLoader::do_compile(unique_ptr *mod, TableStorage &ts, } // Initialize a compiler invocation object from the clang (-cc1) arguments. - const driver::ArgStringList &ccargs = cmd.getArguments(); + const llvm::opt::ArgStringList &ccargs = cmd.getArguments(); if (flags_ & DEBUG_PREPROCESSOR) { llvm::errs() << "clang";