Skip to content

Commit c8cfa1e

Browse files
authored
Remove errors on ancient EMMAKEN environment variables (#27452)
While working on #27401 these seems like errors that were not worth reproducing in the native launcher.
1 parent 223995c commit c8cfa1e

2 files changed

Lines changed: 0 additions & 22 deletions

File tree

emcc.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -306,16 +306,6 @@ def main(args):
306306
print(libname)
307307
return 0
308308

309-
if 'EMMAKEN_NO_SDK' in os.environ:
310-
exit_with_error('EMMAKEN_NO_SDK is no longer supported. The standard -nostdlib and -nostdinc flags should be used instead')
311-
312-
if 'EMMAKEN_COMPILER' in os.environ:
313-
exit_with_error('`EMMAKEN_COMPILER` is no longer supported.\n' +
314-
'Please use the `LLVM_ROOT` and/or `COMPILER_WRAPPER` config settings instead')
315-
316-
if 'EMMAKEN_CFLAGS' in os.environ:
317-
exit_with_error('`EMMAKEN_CFLAGS` is no longer supported, please use `EMCC_CFLAGS` instead')
318-
319309
if 'EMCC_REPRODUCE' in os.environ:
320310
options.reproduce = os.environ['EMCC_REPRODUCE']
321311

test/test_other.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12451,14 +12451,6 @@ def test_missing_malloc_export(self):
1245112451
def test_getrusage(self):
1245212452
self.do_other_test('test_getrusage.c')
1245312453

12454-
@with_env_modify({'EMMAKEN_COMPILER': shared.CLANG_CC})
12455-
def test_emmaken_compiler(self):
12456-
self.assert_fail([EMCC, '-c', test_file('core/test_hello_world.c')], 'emcc: error: `EMMAKEN_COMPILER` is no longer supported')
12457-
12458-
@with_env_modify({'EMMAKEN_CFLAGS': '-O2'})
12459-
def test_emmaken_cflags(self):
12460-
self.assert_fail([EMCC, '-c', test_file('core/test_hello_world.c')], 'emcc: error: `EMMAKEN_CFLAGS` is no longer supported')
12461-
1246212454
@no_windows('relies on a shell script')
1246312455
def test_compiler_wrapper(self):
1246412456
create_file('wrapper.sh', '''\
@@ -13045,10 +13037,6 @@ def test_missing_symbols_at_runtime(self, args):
1304513037
cflags=['-sWARN_ON_UNDEFINED_SYMBOLS=0', '-sAUTO_JS_LIBRARIES=0'] + args,
1304613038
assert_returncode=NON_ZERO)
1304713039

13048-
@with_env_modify({'EMMAKEN_NO_SDK': '1'})
13049-
def test_EMMAKEN_NO_SDK(self):
13050-
self.assert_fail([EMCC, test_file('hello_world.c')], 'emcc: error: EMMAKEN_NO_SDK is no longer supported')
13051-
1305213040
@parameterized({
1305313041
'default': ('', '2147483648'),
1305413042
'1GB': ('-sMAXIMUM_MEMORY=1GB', '1073741824'),

0 commit comments

Comments
 (0)