Skip to content

Commit ea9eb75

Browse files
committed
Remove RUNTIME_LINKED_LIBS setting
We have had this marked as deprecated since #14004 (more than 4 years).
1 parent 5304ef8 commit ea9eb75

File tree

4 files changed

+4
-34
lines changed

4 files changed

+4
-34
lines changed

site/source/docs/tools_reference/settings_reference.rst

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,17 +1658,6 @@ Corresponds to MAIN_MODULE (also supports modes 1 and 2)
16581658

16591659
Default value: 0
16601660

1661-
.. _runtime_linked_libs:
1662-
1663-
RUNTIME_LINKED_LIBS
1664-
===================
1665-
1666-
Deprecated, list shared libraries directly on the command line instead.
1667-
1668-
.. note:: This setting is deprecated
1669-
1670-
Default value: []
1671-
16721661
.. _build_as_worker:
16731662

16741663
BUILD_AS_WORKER
@@ -3471,3 +3460,4 @@ for backwards compatbility with older versions:
34713460
- ``USE_OFFSET_COVERTER``: No longer supported, not needed with modern v8 versions (Valid values: [0])
34723461
- ``ASYNCIFY_LAZY_LOAD_CODE``: No longer supported (Valid values: [0])
34733462
- ``USE_WEBGPU``: No longer supported; replaced by --use-port=emdawnwebgpu, which implements a newer (but incompatible) version of webgpu.h - see tools/ports/emdawnwebgpu.py (Valid values: [0])
3463+
- ``RUNTIME_LINKED_LIBS``: list shared libraries directly on the command line instead (Valid values: [[]])

src/settings.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,11 +1135,6 @@ var MAIN_MODULE = 0;
11351135
// [compile+link]
11361136
var SIDE_MODULE = 0;
11371137

1138-
// Deprecated, list shared libraries directly on the command line instead.
1139-
// [link]
1140-
// [deprecated]
1141-
var RUNTIME_LINKED_LIBS = [];
1142-
11431138
// If set to 1, this is a worker library, a special kind of library that is run
11441139
// in a worker. See emscripten.h
11451140
// [link]

test/test_other.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6644,20 +6644,7 @@ def percent_diff(x, y):
66446644
self.assertLess(side_dce_fail[1], 0.95 * side_dce_work[1]) # removing that function saves a chunk
66456645

66466646
def test_RUNTIME_LINKED_LIBS(self):
6647-
# Verify that the legacy `-sRUNTIME_LINKED_LIBS` option acts the same as passing a
6648-
# library on the command line directly.
6649-
create_file('side.c', 'int foo() { return 42; }')
6650-
create_file('main.c', '#include <assert.h>\nextern int foo(); int main() { assert(foo() == 42); return 0; }')
6651-
6652-
self.run_process([EMCC, '-O2', 'side.c', '-sSIDE_MODULE', '-o', 'side.wasm'])
6653-
self.run_process([EMCC, '-O2', 'main.c', '-sMAIN_MODULE', '-o', 'main.js', 'side.wasm'])
6654-
self.run_js('main.js')
6655-
6656-
err = self.run_process([EMCC, '-O2', 'main.c', '-sMAIN_MODULE', '-o', 'main2.js', '-sRUNTIME_LINKED_LIBS=side.wasm'], stderr=PIPE).stderr
6657-
self.assertContained('emcc: warning: RUNTIME_LINKED_LIBS is deprecated', err)
6658-
self.run_js('main2.js')
6659-
6660-
self.assertBinaryEqual('main.wasm', 'main2.wasm')
6647+
self.assert_fail([EMCC, test_file('hello_world.c'), '-sRUNTIME_LINKED_LIBS=side.wasm'], 'list shared libraries directly on the command line instead')
66616648

66626649
@parameterized({
66636650
'': ([],),

tools/settings.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@
102102
'LTO',
103103
'OPT_LEVEL',
104104
'DEBUG_LEVEL',
105-
106-
# This is legacy setting that we happen to handle very early on
107-
'RUNTIME_LINKED_LIBS',
108105
}.union(PORTS_SETTINGS)
109106

110107
# Unlike `LEGACY_SETTINGS`, deprecated settings can still be used
@@ -115,7 +112,6 @@
115112
#
116113
# All settings here should be tagged as `[deprecated]` in settings.js
117114
DEPRECATED_SETTINGS = {
118-
'RUNTIME_LINKED_LIBS': 'you can simply list the libraries directly on the commandline now',
119115
'CLOSURE_WARNINGS': 'use -Wclosure/-Wno-closure instead',
120116
'LEGALIZE_JS_FFI': 'to disable JS type legalization use `-sWASM_BIGINT` or `-sSTANDALONE_WASM`',
121117
'ASYNCIFY_EXPORTS': 'please use JSPI_EXPORTS instead',
@@ -250,8 +246,10 @@
250246
['USE_OFFSET_COVERTER', [0], 'No longer supported, not needed with modern v8 versions'],
251247
['ASYNCIFY_LAZY_LOAD_CODE', [0], 'No longer supported'],
252248
['USE_WEBGPU', [0], 'No longer supported; replaced by --use-port=emdawnwebgpu, which implements a newer (but incompatible) version of webgpu.h - see tools/ports/emdawnwebgpu.py'],
249+
['RUNTIME_LINKED_LIBS', [[]], 'list shared libraries directly on the command line instead'],
253250
]
254251

252+
255253
user_settings: Dict[str, str] = {}
256254

257255

0 commit comments

Comments
 (0)