Skip to content

Commit

Permalink
Fix lingering uses of --bind. (#18806)
Browse files Browse the repository at this point in the history
These should all be `-lembind`.
  • Loading branch information
waywardmonkeys authored Feb 21, 2023
1 parent fa339b7 commit 5ea6244
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion site/source/docs/porting/asyncify.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion test/embind/build_benchmark
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions test/test_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion test/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 5ea6244

Please sign in to comment.