diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-05-22 17:50:25 +0200 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-05-22 17:50:25 +0200 |
commit | b7ce870dd4b1352e308e212e77cd6161c1ec904e (patch) | |
tree | de0a20655c18bd0f2782e84d1a0793979ea3ef53 /tools | |
parent | 4a3471dcc50c365f10ad37ab6d59a67e40b7a8e1 (diff) |
create directories to work around llvm-nm silent failures if it can't generate the file
Diffstat (limited to 'tools')
-rw-r--r-- | tools/shared.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/shared.py b/tools/shared.py index c4472454..52b47ef6 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -542,15 +542,15 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e if len(contents) == 0: print >> sys.stderr, 'Warning: Archive %s appears to be empty (recommendation: link an .so instead of .a)' % f else: + for content in contents: # ar will silently fail if the directory for the file does not exist, so make all the necessary directories + dirname = os.path.dirname(content) + if dirname and not os.path.exists(dirname): + os.makedirs(dirname) Popen([LLVM_AR, 'x', f], stdout=PIPE).communicate() # if absolute paths, files will appear there. otherwise, in this directory + contents = map(lambda content: os.path.join(temp_dir, content), contents) + contents = filter(os.path.exists, map(os.path.abspath, contents)) needed = False # We add or do not add the entire archive. We let llvm dead code eliminate parts we do not need, instead of # doing intra-dependencies between archive contents - for i in range(len(contents)): - if not os.path.exists(contents[i]): - # not one that works from this directory (so, not relative to this dir, and not absolute) - # so must be under cwd, the build dir - contents[i] = os.path.join(cwd, contents[i]) - contents = filter(os.path.exists, map(os.path.abspath, contents)) for content in contents: new_symbols = Building.llvm_nm(content) # Link in the .o if it provides symbols, *or* this is a singleton archive (which is apparently an exception in gcc ld) |