From 55516821a9ba5432d899bf81d81861f550c430d5 Mon Sep 17 00:00:00 2001 From: "Ian A. Mason" Date: Tue, 13 Oct 2020 09:50:47 -0700 Subject: [PATCH] Clean up. --- shared/extractor.go | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/shared/extractor.go b/shared/extractor.go index 5f0a150..37a6b89 100644 --- a/shared/extractor.go +++ b/shared/extractor.go @@ -490,28 +490,6 @@ func handleArchive(ea ExtractionArgs) (success bool) { LogDebug("Table of Contents of %v:\n%v\n", inputFile, toc) //2. extract the files from the TOC - /* - for obj, instance := range toc { - for i := 1; i <= instance; i++ { - - if obj != "" && extractFile(ea, inputFile, obj, i) { - var artifacts []string - artifacts, success = ea.Extractor(obj) - if !success && ea.StrictExtract { - return - } - LogInfo("\t%v\n", artifacts) - artifactFiles = append(artifactFiles, artifacts...) - for _, bc := range artifacts { - bcPath := resolveBitcodePath(bc) - if bcPath != "" { - bcFiles = append(bcFiles, bcPath) - } - } - } - } - } - */ success, artifactFiles, bcFiles = extractFiles(ea, inputFile, toc) //extractFiles has already complained if !success { @@ -526,6 +504,7 @@ func handleArchive(ea ExtractionArgs) (success bool) { LogDebug("handleArchive: walked %v\nartifactFiles:\n%v\nbcFiles:\n%v\n", tmpDirName, artifactFiles, bcFiles) + //3. link or archive those puppies if len(bcFiles) > 0 { // Sort the bitcode files