Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions emsdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -905,8 +905,8 @@ def build_env(generator):
return build_env


def make_build(build_root, build_type, build_target_platform='x64'):
debug_print('make_build(build_root=' + build_root + ', build_type=' + build_type + ', build_target_platform=' + build_target_platform + ')')
def make_build(build_root, build_type):
debug_print('make_build(build_root=' + build_root + ', build_type=' + build_type + ')')
if CPU_CORES > 1:
print('Performing a parallel build with ' + str(CPU_CORES) + ' cores.')
else:
Expand Down Expand Up @@ -1111,7 +1111,7 @@ def build_llvm(tool):
return False

# Make
success = make_build(build_root, build_type, 'x64' if tool.bitness == 64 else 'Win32')
success = make_build(build_root, build_type)
return success


Expand All @@ -1137,7 +1137,7 @@ def build_ninja(tool):
return False

# Make
success = make_build(build_root, build_type, 'x64' if tool.bitness == 64 else 'Win32')
success = make_build(build_root, build_type)

if success:
bin_dir = os.path.join(root, 'bin')
Expand Down Expand Up @@ -1177,7 +1177,7 @@ def build_ccache(tool):
return False

# Make
success = make_build(build_root, build_type, 'x64' if tool.bitness == 64 else 'Win32')
success = make_build(build_root, build_type)

if success:
bin_dir = os.path.join(root, 'bin')
Expand Down Expand Up @@ -1337,7 +1337,7 @@ def emscripten_post_install(tool):
return False

# Make
success = make_build(build_root, build_type, 'x64' if tool.bitness == 64 else 'Win32')
success = make_build(build_root, build_type)
if not success:
return False

Expand Down Expand Up @@ -1387,7 +1387,7 @@ def build_binaryen_tool(tool):
return False

# Make
success = make_build(build_root, build_type, 'x64' if tool.bitness == 64 else 'Win32')
success = make_build(build_root, build_type)

# Deploy scripts needed from source repository to build directory
remove_tree(os.path.join(build_root, 'scripts'))
Expand Down