diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-03-06 14:46:00 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-03-06 15:39:23 -0800 |
| commit | f60959da5665054b903c3612878e717cf1249e58 (patch) | |
| tree | d71849580ca77e8a4803eebe084c8d36b37f340e | |
| parent | 565db2670ed4edfa4c3c851d61a1c591c7ae8331 (diff) | |
only include necessary system libraries amongst each other based on explicit dependencies; fixes #2191
| -rw-r--r-- | tests/test_other.py | 2 | ||||
| -rw-r--r-- | tools/system_libs.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/test_other.py b/tests/test_other.py index 9e9c9bef..5af2b22c 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -114,8 +114,6 @@ Options that are modified or new in %s include: os.chdir(self.get_dir()) self.clear() - # dlmalloc. dlmalloc is special in that it is the only part of libc that is (1) hard to write well, and - # very speed-sensitive. So we do not implement it in JS in library.js, instead we compile it from source for source, has_malloc in [('hello_world' + suffix, False), ('hello_malloc.cpp', True)]: print source, has_malloc self.clear() diff --git a/tools/system_libs.py b/tools/system_libs.py index 92f13bdb..ee185a51 100644 --- a/tools/system_libs.py +++ b/tools/system_libs.py @@ -373,7 +373,6 @@ def calculate(temp_files, in_temp, stdout, stderr): ('libcxxabi', create_libcxxabi, apply_libcxxabi, libcxxabi_symbols, ['libc']), ('gl', create_gl, lambda x: True, gl_symbols, ['libc']), ('libc', create_libc, apply_libc, libc_symbols, [])]: - force = force.union(deps) force_this = force_all or name in force if not force_this: need = set() @@ -394,5 +393,6 @@ def calculate(temp_files, in_temp, stdout, stderr): logging.debug('including %s' % name) libfile = shared.Cache.get(name, create) ret.append(libfile) + force = force.union(deps) return ret |