Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge emscripten 3.1.1 #112

Merged
merged 62 commits into from
Feb 16, 2022
Merged

Conversation

radekdoulik
Copy link
Member

Also revert 2.0.34 commit as it was squashed by mistake and re-merge the 2.0.34 PR branch again, before merging 3.1.1

sbc100 and others added 30 commits June 8, 2021 10:08
…net#837)

Also, improve reporting of version resolution. e.g.:

```
$ ./emsdk  install sdk-latest
Resolving SDK alias 'latest' to '2.0.23'
Resolving SDK version '2.0.23' to 'sdk-releases-upstream-77b065ace39e6ab21446e13f92897f956c80476a-64bit'
Installing SDK 'sdk-releases-upstream-77b065ace39e6ab21446e13f92897f956c80476a-64bit'..
...
```
Previously if a tool (any part of an SDK) was not installed
we would issue a warning and continue to active without returning
non-zero.

This meant doing `emsdk install 2.0.0 && emsdk activate latest`
would appear to be work aside from the warning messages about
latest not being installed.

This is especially annoying since we dropped support for side
by side SDK installations.  The following sequence is no longer
valid and we want to make that clear by erroring out:

```
$ emsdk install 2.0.1
$ emsdk install 2.0.2
$ emsdk activate 2.0.1
```

Since 2.0.2 replaces 2.0.1 on the filesystem the active here
could fail hard rather than just warning.
This should help debug cases when the link_wrapper is not invoked correctly.
When linking with `-o filename` (such as in various CMake build checks), the parameter passed to the linker is a temporary file, and it is passed as a bare filename (i.e. relative path without a `'/'`). In such cases, `outdir` would have been the empty string, and the final `tar` command would fail (actually the call to `subprocess.check_call(…)` is what fails).
Includes LTO and non-LTO, with non-LTO as the default
In the past the instructions were to copy `emscripten_toolchain` into the project dir, now it downloads emsdk as a package so the `bazelrc` part has to refer to `@emsdk`.
This was missing from emsdk_manifest.json and should alow older fastcomp
SDKs to be install on M1 apple hardware (in emulation mode).

Fixes: dotnet#889
Make untargz() in emsdk.py return False if tar command failed.
…ant to see double quotes in the field passed to it. (dotnet#898)
* Add embind example to Bazel docs

* address feedback
* Update build_bazel_rules_nodejs to fix closure compiles

* Fix spacing in update_bazel_workspace.sh script

* space
sbc100 and others added 22 commits November 22, 2021 15:09
* Always output a tarball from cc_binary to simplify logic. This will change the result of --config=wasm builds that were previously outputting a single file.

* better to use early return here

* Always output a tarball from cc_binary to simplify logic. This will change the result of --config=wasm builds that were previously outputting a single file.

* better to use early return here

Co-authored-by: Mitch Foley <mitchfoley@chromium.org>
Prevent downloading the tool archives all over again, if you
switch some emscripten or tool version.
I'm not sure how that wrong was added by the create_release script.
Followup to dotnet#930: Add a tests, and remove newly-unused arguments
to unzip and untargz.
When invoking "emsdk help", there is a typo/grammatical error in the second to last paragraph.
See also:

    emscripten-core#957
The usage of this argument was removed in dotnet#838.
The newer versions of eslint require 14.17.0 or above.  This
updates our node version to the latest in the 14.XX series.

I don't expect any user-visible changes.
@radekdoulik radekdoulik requested a review from lewing February 15, 2022 18:49
@radekdoulik radekdoulik marked this pull request as ready for review February 16, 2022 19:00
@radekdoulik
Copy link
Member Author

It should be merged or rebased without squashing, to allow smooth merge of upstream in future.

@lewing
Copy link
Member

lewing commented Feb 16, 2022

Lets get links to the staged prs in dotnet/icu and dotnet/runtime here then we can try rolling forward

@radekdoulik
Copy link
Member Author

dotnet/icu PR: dotnet/icu#183
dotnet/runtime PR: dotnet/runtime#63894

Copy link
Member

@lewing lewing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's try this again.

@lewing lewing merged commit 7ebab71 into dotnet:main Feb 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.