diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2019-10-16 04:57:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 04:57:52 +0300 |
| commit | 27247739c68faee7b2a63ae805222d4b375d2161 (patch) | |
| tree | d17b6515561d9451b6d1bb42d20392997cc9db77 /sdks | |
| parent | 08e8a7f2c3c43366358901d304bfe2808962577a (diff) | |
[wasm] Bump emscripten. Remove generated python cache files. (#17340)
* [wasm] Bump emscripten to 1.38.48.
* Remove generated python cache files.
Diffstat (limited to 'sdks')
| -rw-r--r-- | sdks/builds/emscripten-pr-8457.diff | 10 | ||||
| -rw-r--r-- | sdks/builds/wasm.mk | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/sdks/builds/emscripten-pr-8457.diff b/sdks/builds/emscripten-pr-8457.diff index e6ae67952b8..3a03bf669ec 100644 --- a/sdks/builds/emscripten-pr-8457.diff +++ b/sdks/builds/emscripten-pr-8457.diff @@ -1,15 +1,5 @@ --- a/emcc.py 2019-08-13 20:07:34.000000000 -0500 +++ b/emcc.py 2019-08-27 08:05:39.000000000 -0500 -@@ -890,6 +890,9 @@ - lib_dirs = [shared.path_from_root('system', 'local', 'lib'), - shared.path_from_root('system', 'lib')] - -+ # -c mean compile to object files(s), don't link -+ has_dash_c = '-c' in newargs -+ - # find input files this a simple heuristic. we should really analyze - # based on a full understanding of gcc params, right now we just assume that - # what is left contains no more |-x OPT| things @@ -915,7 +918,7 @@ file_suffix = get_file_suffix(arg) if file_suffix in SOURCE_ENDINGS + BITCODE_ENDINGS + DYNAMICLIB_ENDINGS + ASSEMBLY_ENDINGS + HEADER_ENDINGS or shared.Building.is_ar(arg): # we already removed -o <target>, so all these should be inputs diff --git a/sdks/builds/wasm.mk b/sdks/builds/wasm.mk index 715fa068a45..8e7e142dd3f 100644 --- a/sdks/builds/wasm.mk +++ b/sdks/builds/wasm.mk @@ -1,7 +1,7 @@ #emcc has lots of bash'isms SHELL:=/bin/bash -EMSCRIPTEN_VERSION=1.38.47 +EMSCRIPTEN_VERSION=1.38.48 EMSCRIPTEN_LOCAL_SDK_DIR=$(TOP)/sdks/builds/toolchains/emsdk EMSCRIPTEN_SDK_DIR ?= $(EMSCRIPTEN_LOCAL_SDK_DIR) |