Skip to contentSkip to conversation

buildtools: fix archive extraction for LLVM 8

PATCH Applied Dmitry Kozlyuk 2 participants 2 messages Jan 28, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 buildtools/gen-pmdinfo-cfile.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
buildtools/gen-pmdinfo-cfile.py +6 -5
index a4e080199..58fe3ad15 100644
@@ -9,11 +9,12 @@
 
 _, 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)
Signature · 1 line
2.29.2