diff options
Diffstat (limited to 'emcc')
| -rwxr-xr-x | emcc | 37 |
1 files changed, 32 insertions, 5 deletions
@@ -116,7 +116,7 @@ shared.check_sanity(force=DEBUG) if len(sys.argv) == 1: print 'emcc: no input files' - exit(0) + exit(1) if sys.argv[1] == '--version': print '''emcc (Emscripten GCC-like replacement) 2.0 @@ -327,6 +327,20 @@ Options that are modified or new in %s include: llvm-link's behavior is not as permissive as ld is. + --jcache Use a JavaScript cache. This is disabled by + default. When enabled, emcc will store the + results of compilation in a cache and check + the cache when compiling later, something + like what ccache does. This allows incremental + builds - where you are compiling a large + program but only modified a small part of it - + to be much faster (at the cost of more disk + IO for cache accesses). Note that you need + to enable --jcache for both loading and saving + of data, so you must enable it on a full build + for a later incremental build (where you also + enable it) to be sped up. + --clear-cache Manually clears the cache of compiled emscripten system libraries (libc++, libc++abi, dlmalloc). This is normally @@ -336,7 +350,10 @@ Options that are modified or new in %s include: mechanism can get confused. Clearing the cache can fix weird problems related to cache incompatibilities, like clang failing - to link with library files. + to link with library files. This also clears + other cached data like the jcache and + the bootstrapped relooper. After the cache + is cleared, this process will exit. The target file, if specified (-o <target>), defines what will be generated: @@ -571,6 +588,7 @@ try: remove_duplicates = False keep_debug = False bind = False + jcache = False def check_bad_eq(arg): assert '=' not in arg, 'Invalid parameter (do not use "=" with "--" options)' @@ -678,10 +696,14 @@ try: elif newargs[i] == '--remove-duplicates': remove_duplicates = True newargs[i] = '' + elif newargs[i] == '--jcache': + jcache = True + newargs[i] = '' elif newargs[i] == '--clear-cache': newargs[i] = '' print >> sys.stderr, 'emcc: clearing cache' shared.Cache.erase() + sys.exit(0) elif newargs[i].startswith(('-I/', '-L/')): if not absolute_warning_shown: print >> sys.stderr, 'emcc: warning: -I or -L of an absolute path encountered. If this is to a local system header/library, it may cause problems (local system files make sense for compiling natively on your system, but not necessarily to JavaScript)' # Of course an absolute path to a non-system-specific library or header is fine, and you can ignore this warning. The danger are system headers that are e.g. x86 specific and nonportable. The emscripten bundled headers are modified to be portable, local system ones are generally not @@ -695,6 +717,8 @@ try: minify_whitespace = closure # if closure is run, minify whitespace if opt_level <= 0: keep_debug = True # always keep debug in -O0 + if DEBUG: start_time = time.time() # done after parsing arguments, which might affect debug state + if closure: assert os.path.exists(shared.CLOSURE_COMPILER), 'emcc: fatal: Closure compiler (%s) does not exist' % shared.CLOSURE_COMPILER @@ -1044,6 +1068,7 @@ try: # Emscripten if DEBUG: print >> sys.stderr, 'emcc: LLVM => JS' extra_args = [] if not js_libraries else ['--libraries', ','.join(map(os.path.abspath, js_libraries))] + if jcache: extra_args.append('--jcache') final = shared.Building.emscripten(final, append_ext=False, extra_args=extra_args) if DEBUG: save_intermediate('original') @@ -1100,12 +1125,12 @@ try: if len(js_optimizer_queue) > 0: if DEBUG < 2: if DEBUG: print >> sys.stderr, 'emcc: applying js optimization passes:', js_optimizer_queue - final = shared.Building.js_optimizer(final, js_optimizer_queue) + final = shared.Building.js_optimizer(final, js_optimizer_queue, jcache) if DEBUG: save_intermediate('js_opts') else: for name in js_optimizer_queue: print >> sys.stderr, 'emcc: applying js optimization pass:', name - final = shared.Building.js_optimizer(final, [name]) + final = shared.Building.js_optimizer(final, [name], jcache) save_intermediate(name) js_optimizer_queue = [] @@ -1114,7 +1139,7 @@ try: if DEBUG >= 2: # Clean up the syntax a bit - final = shared.Building.js_optimizer(final, []) + final = shared.Building.js_optimizer(final, [], jcache) if DEBUG: save_intermediate('pretty') def get_eliminate(): @@ -1221,6 +1246,8 @@ try: # copy final JS to output shutil.move(final, target) + if DEBUG: print >> sys.stderr, 'emcc: total time: %.2f seconds' % (time.time() - start_time) + finally: if not TEMP_DIR: try: |