This commit is contained in:
Alon Zakai 2014-03-28 16:31:21 -07:00
Родитель 22bc2ba14a
Коммит 20bfe6cf84
1 изменённых файлов: 4 добавлений и 4 удалений

8
emcc
Просмотреть файл

@ -95,8 +95,7 @@ AUTODEBUG = os.environ.get('EMCC_AUTODEBUG') # If set to 1, we will run the auto
# dlmalloc makes it hard to compare native and js builds # dlmalloc makes it hard to compare native and js builds
EMCC_CFLAGS = os.environ.get('EMCC_CFLAGS') # Additional compiler flags that we treat as if they were passed to us on the commandline EMCC_CFLAGS = os.environ.get('EMCC_CFLAGS') # Additional compiler flags that we treat as if they were passed to us on the commandline
if DEBUG: logging.warning('invocation: ' + ' '.join(sys.argv) + (' + ' + EMCC_CFLAGS if EMCC_CFLAGS else '')) if DEBUG: logging.warning('invocation: ' + ' '.join(sys.argv) + (' + ' + EMCC_CFLAGS if EMCC_CFLAGS else '') + ' (in ' + os.getcwd() + ')')
if EMCC_CFLAGS: sys.argv.append(EMCC_CFLAGS) if EMCC_CFLAGS: sys.argv.append(EMCC_CFLAGS)
if DEBUG and LEAVE_INPUTS_RAW: logging.warning('leaving inputs raw') if DEBUG and LEAVE_INPUTS_RAW: logging.warning('leaving inputs raw')
@ -975,7 +974,7 @@ try:
# swap in debug logging # swap in debug logging
DEBUG = 1 DEBUG = 1
shared.set_logging() shared.set_logging()
logging.debug('invocation: ' + ' '.join(sys.argv)) logging.debug('-v invocation: ' + ' '.join(sys.argv))
shared.apply_configuration() # reset config to pick up change shared.apply_configuration() # reset config to pick up change
shared.check_sanity(force=True) shared.check_sanity(force=True)
newargs[i] = '' newargs[i] = ''
@ -1445,9 +1444,10 @@ try:
# we have multiple files: Link them # we have multiple files: Link them
logging.debug('link: ' + str(temp_files) + specified_target) logging.debug('link: ' + str(temp_files) + specified_target)
shared.Building.link(temp_files, specified_target) shared.Building.link(temp_files, specified_target)
logging.debug('stopping at bitcode')
exit(0) exit(0)
log_time('bitcodeize inputs') log_time('process inputs')
## Continue on to create JavaScript ## Continue on to create JavaScript