From c85ebb39dbdd1b2696860858a10230dee8162929 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Thu, 28 Jan 2021 22:05:15 +0300 Subject: [PATCH] buildtools: fix archive extraction for LLVM 8 "llvm-ar xv lib.a" from LLVM 8 doesn't print extracted object file names. The effect of "v" is not formally specified either. Use "llvm-ar t" to get archive member names. Reported-by: Xueming Zhang Signed-off-by: Dmitry Kozlyuk --- buildtools/gen-pmdinfo-cfile.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/buildtools/gen-pmdinfo-cfile.py b/buildtools/gen-pmdinfo-cfile.py index a4e0801991..58fe3ad152 100644 --- a/buildtools/gen-pmdinfo-cfile.py +++ b/buildtools/gen-pmdinfo-cfile.py @@ -9,11 +9,12 @@ import tempfile _, tmp_root, ar, archive, output, *pmdinfogen = sys.argv with tempfile.TemporaryDirectory(dir=tmp_root) as temp: - proc = subprocess.run( - # Don't use "ar p", because its output is corrupted on Windows. - [ar, "xv", os.path.abspath(archive)], stdout=subprocess.PIPE, check=True, cwd=temp + run_ar = lambda command: subprocess.run( + [ar, command, os.path.abspath(archive)], + stdout=subprocess.PIPE, check=True, cwd=temp ) - lines = proc.stdout.decode().splitlines() - names = [line[len("x - ") :] for line in lines] + # Don't use "ar p", because its output is corrupted on Windows. + run_ar("x") + names = run_ar("t").stdout.decode().splitlines() paths = [os.path.join(temp, name) for name in names] subprocess.run(pmdinfogen + paths + [output], check=True) -- 2.20.1