Skip to content

Commit 3625d4b

Browse files
authored
Remove MEMORY64=2 special casing from embuilder. NFC (#26418)
Also, when building system libraries we don't need to distinguish between MEMORY64=1 and MEMORY64=2.
1 parent 97e3809 commit 3625d4b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

embuilder.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,7 @@ def main():
239239
settings.MAIN_MODULE = 1
240240

241241
if args.wasm64:
242-
settings.MEMORY64 = 2
243-
MINIMAL_TASKS[:] = [t for t in MINIMAL_TASKS if 'emmalloc' not in t]
242+
settings.MEMORY64 = 1
244243

245244
do_build = args.operation == 'build'
246245
do_clear = args.operation == 'clear'

tools/system_libs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def get_base_cflags(build_dir, force_object_files=False, preprocess=True):
7070
if preprocess:
7171
flags += ['-DEMSCRIPTEN_DYNAMIC_LINKING']
7272
if settings.MEMORY64:
73-
flags += ['-sMEMORY64=' + str(settings.MEMORY64)]
73+
flags += ['-sMEMORY64']
7474

7575
source_dir = utils.path_from_root()
7676
relative_source_dir = os.path.relpath(source_dir, build_dir)

0 commit comments

Comments
 (0)