aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-10-31 12:45:10 -0700
committerAlon Zakai <alonzakai@gmail.com>2011-10-31 12:45:10 -0700
commita349c5df70c2e2c6e5aaa82b22742161adfeec0b (patch)
tree98ed09693ab02c604f28179a6c508ad6aa03ad39 /tools
parentff75e6bd470dcd5a3c6c8945d43e348192f2c9d5 (diff)
building tweak
Diffstat (limited to 'tools')
-rw-r--r--tools/shared.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py
index 7cd0fcb8..d5629b50 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -238,6 +238,12 @@ class Building:
except:
old_dir = None
os.chdir(project_dir)
+ generated_libs = map(lambda lib: os.path.join(project_dir, lib), generated_libs)
+ #for lib in generated_libs:
+ # try:
+ # os.unlink(lib) # make sure compilation completed successfully
+ # except:
+ # pass
env = os.environ.copy()
env['RANLIB'] = env['AR'] = env['CXX'] = env['CC'] = env['LIBTOOL'] = EMMAKEN
env['EMMAKEN_COMPILER'] = Building.COMPILER
@@ -253,7 +259,7 @@ class Building:
Popen(make + make_args, stdout=open(os.path.join(output_dir, 'make_'), 'w'),
stderr=open(os.path.join(output_dir, 'make_err'), 'w'), env=env).communicate()[0]
bc_file = os.path.join(project_dir, 'bc.bc')
- Building.link(map(lambda lib: os.path.join(project_dir, lib), generated_libs), bc_file)
+ Building.link(generated_libs, bc_file)
if cache is not None:
cache[cache_name] = open(bc_file, 'rb').read()
if old_dir: