aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-05-05 16:26:22 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-05-05 16:26:22 -0700
commit2a85aa178d7b14ff689c061361bf50ab85d2573a (patch)
tree03b160f7a14f0e26bcf56f9d90dca09fb92337a9
parentbf673b03ca52e3613b78ddf412cb99be71a4d816 (diff)
update comments
-rwxr-xr-xemcc5
1 files changed, 2 insertions, 3 deletions
diff --git a/emcc b/emcc
index 584b7bca..9d437ecd 100755
--- a/emcc
+++ b/emcc
@@ -1131,8 +1131,6 @@ try:
not shared.Settings.BUILD_AS_SHARED_LIB == 2: # shared lib 2 use the library in the parent
# Check if we need to include some libraries that we compile. (We implement libc ourselves in js, but
# compile a malloc implementation and stdlibc++.)
- # Note that we assume a single symbol is enough to know if we have/do not have dlmalloc etc. If you
- # include just a few symbols but want the rest, this will not work.
def read_symbols(path, exclude=None):
symbols = map(lambda line: line.strip().split(' ')[1], open(path).readlines())
@@ -1328,9 +1326,10 @@ try:
#logging.info('using libcxxabi, this may need CORRECT_* options')
#shared.Settings.CORRECT_SIGNS = shared.Settings.CORRECT_OVERFLOWS = shared.Settings.CORRECT_ROUNDINGS = 1
- # If we have libcxx, we must force inclusion of libc, since libcxx uses new internally. Note: this is kind of hacky
# Settings this in the environment will avoid checking dependencies and make building big projects a little faster
force = os.environ.get('EMCC_FORCE_STDLIBS')
+
+ # If we have libcxx, we must force inclusion of libc, since libcxx uses new internally. Note: this is kind of hacky.
has = need = None
for name, create, fix, library_symbols in [('libcxx', create_libcxx, fix_libcxx, libcxx_symbols),
('libcextra', create_libcextra, fix_libcextra, libcextra_symbols),