Skip to content

Commit

Permalink
Update emascripten external and update build to work
Browse files Browse the repository at this point in the history
  • Loading branch information
jterrace committed Jan 5, 2012
1 parent 1027c8f commit 144443f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "external/emscripten"]
path = external/emscripten
url = git://github.com/kripken/emscripten.git
url = git://github.com/jterrace/emscripten.git
15 changes: 4 additions & 11 deletions builder/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,6 @@ def compile(**kwargs):

emconfigure = get_emconfigure_path()

FLAGS = " ".join(["-Wno-implicit-int"
])

config_env = dict(HOST_CC=get_clang_path(),
HOST_CXX=get_clangpp_path(),
HOST_CFLAGS=FLAGS,
HOST_CXXFLAGS=FLAGS
)

configure_line = [emconfigure,
"./configure",
"--disable-methodjit",
Expand All @@ -174,8 +165,10 @@ def compile(**kwargs):

makefile_path = util.abspath_join(js_src_dir, "./Makefile")
if not os.path.isfile(makefile_path):
print("Using environment:\n" + "\n".join(" %s=%s" % (k,v) for k,v in config_env.iteritems()))
util.run_command(configure_line, cwd=js_src_dir, env=dict(os.environ.items() + config_env.items()))
util.run_command(configure_line, cwd=js_src_dir)

jsapi_h_path = util.abspath_join(js_src_dir, "./jsapi.h")
filter_file(jsapi_h_path, compile_filters.jsapi_filters)

util.run_command(["make"], cwd=js_src_dir)

Expand Down
3 changes: 2 additions & 1 deletion builder/jsjs/emscripten.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
CLOSURE_COMPILER = "%CLOSURE_COMPILER%"
TEMP_DIR = '/tmp'
COMPILER_ENGINE = V8_ENGINE
JS_ENGINES = []
JS_ENGINES = [V8_ENGINE]
DEBUG_TAGS_SHOWING = [] #add 'frameworkLines' to this list for debugging
"""

def write_emscripten_config(llvm_root, v8_engine, closure_compiler, emscripten_root, dot_emscripten="~/.emscripten"):
Expand Down

0 comments on commit 144443f

Please sign in to comment.