From 5ea6244c5ccc2dbcc95f4f32e159df773d4652d3 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 22 Feb 2023 00:59:19 +0700 Subject: [PATCH] Fix lingering uses of `--bind`. (#18806) These should all be `-lembind`. --- site/source/docs/porting/asyncify.rst | 2 +- test/embind/build_benchmark | 2 +- test/test_browser.py | 4 ++-- test/test_core.py | 2 +- test/test_other.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/site/source/docs/porting/asyncify.rst b/site/source/docs/porting/asyncify.rst index c92e8249d702..8611605eda04 100644 --- a/site/source/docs/porting/asyncify.rst +++ b/site/source/docs/porting/asyncify.rst @@ -294,7 +294,7 @@ returning a ``Promise`` to the return value, as demonstrated below. Build with :: - emcc -O3 example.cpp --bind -sASYNCIFY + emcc -O3 example.cpp -lembind -sASYNCIFY Then invoke from JavaScript diff --git a/test/embind/build_benchmark b/test/embind/build_benchmark index b0b54c8eb29e..708288d523a5 100755 --- a/test/embind/build_benchmark +++ b/test/embind/build_benchmark @@ -1,2 +1,2 @@ #!/bin/bash -../../emcc --minify 0 --bind --js-library=embind.benchmark.js -O2 --shell-file shell.html -o embind_benchmark.html embind_benchmark.cpp +../../emcc --minify 0 -lembind --js-library=embind.benchmark.js -O2 --shell-file shell.html -o embind_benchmark.html embind_benchmark.cpp diff --git a/test/test_browser.py b/test/test_browser.py index 62e4ea19d841..3c2038a72b52 100644 --- a/test/test_browser.py +++ b/test/test_browser.py @@ -5030,10 +5030,10 @@ def test_emscripten_performance_now(self): @requires_threads def test_embind_with_pthreads(self): - self.btest_exit(test_file('embind/test_pthreads.cpp'), args=['--bind', '-pthread', '-sPTHREAD_POOL_SIZE=2']) + self.btest_exit(test_file('embind/test_pthreads.cpp'), args=['-lembind', '-pthread', '-sPTHREAD_POOL_SIZE=2']) def test_embind_with_asyncify(self): - self.btest('embind_with_asyncify.cpp', '1', args=['--bind', '-sASYNCIFY']) + self.btest('embind_with_asyncify.cpp', '1', args=['-lembind', '-sASYNCIFY']) # Test emscripten_console_log(), emscripten_console_warn() and emscripten_console_error() def test_emscripten_console_log(self): diff --git a/test/test_core.py b/test/test_core.py index 3e161ad2f6b3..5d21bee42259 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -7807,7 +7807,7 @@ def test_embind_sync_if_pthread_delayed(self): self.set_setting('WASM_ASYNC_COMPILATION', 0) self.set_setting('PTHREAD_POOL_DELAY_LOAD', 1) self.set_setting('PTHREAD_POOL_SIZE', 1) - self.emcc_args += ['--bind', '--post-js=' + test_file('core/pthread/test_embind_sync_if_pthread_delayed.post.js')] + self.emcc_args += ['-lembind', '--post-js=' + test_file('core/pthread/test_embind_sync_if_pthread_delayed.post.js')] self.do_run_in_out_file_test(test_file('core/pthread/test_embind_sync_if_pthread_delayed.cpp')) ### Tests for tools diff --git a/test/test_other.py b/test/test_other.py index cbec5c91369f..00b260cfc625 100644 --- a/test/test_other.py +++ b/test/test_other.py @@ -2736,7 +2736,7 @@ def test_embind_finalization(self): [EMXX, test_file('embind/test_finalization.cpp'), '--pre-js', test_file('embind/test_finalization.js'), - '--bind'] + '-lembind'] ) self.node_args += ['--expose-gc'] output = self.run_js('a.out.js', engine=config.NODE_JS)