Skip to content

Commit b2b7bd8

Browse files
committed
Merge
Merge branch 'master' of https://github.com/SRI-CSL/whole-program-llvm
2 parents c041654 + f601b03 commit b2b7bd8

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

extract-bc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ def handleArchive(inputFile, outputFile, arCmd, fileType, extractor, llvmArchive
164164
originalDir = os.getcwd() # This will be the destination
165165

166166
arCmd.append(inputFile);
167-
if verboseFlag:
168-
arCmd.insert(1, '-v')
169167

170168
# Make temporary directory to extract objects to
171169
tempDir = ''
@@ -344,7 +342,7 @@ def process_file_unix(inputFile, outputFile, llvmLinker, llvmArchiver):
344342
logging.debug('Detected file type is {0}'.format(FileType.revMap[ft]))
345343

346344
extractor = extract_section_linux
347-
arCmd = ['ar','x']
345+
arCmd = ['ar', 'xv'] if verboseFlag else ['ar', 'x']
348346
ofileType = FileType.ELF_OBJECT
349347

350348
if ft == FileType.ELF_EXECUTABLE or ft == FileType.ELF_SHARED:
@@ -364,7 +362,7 @@ def process_file_darwin(inputFile, outputFile, llvmLinker, llvmArchiver):
364362
logging.debug('Detected file type is {0}'.format(FileType.revMap[ft]))
365363

366364
extractor = extract_section_darwin
367-
arCmd = ['ar','-x']
365+
arCmd = ['ar', '-x', '-v'] if verboseFlag else ['ar', '-x']
368366
ofileType = FileType.MACH_OBJECT
369367

370368
if ft == FileType.MACH_EXECUTABLE or ft == FileType.MACH_SHARED:

0 commit comments

Comments
 (0)