Omit the vendor component in the WASI triple by sunfishcode · Pull Request #60585 · rust-lang/rust

sunfishcode · 2019-05-06T17:11:21Z

This renames wasm32-unknown-wasi to wasm32-wasi, omitting the vendor
component. This follows aarch64-linux-android, x86_64-fuchsia, and others in
omitting the vendor field, which has the advantage of aligning with the
multiarch tuple, and of being
less noisy.

r? @alexcrichton

alexcrichton · 2019-05-06T18:05:04Z

To confirm, this is the same naming scheme the clang is moving towards, right? I think it makes sense to ensure that we're consistent across the board there!

sunfishcode · 2019-05-06T21:43:56Z

Clang and LLVM themselves accept either form -- the logic to do this is target-independent. But otherwise yeah, we're generally moving to "wasm32-wasi" in documentation, build scripts, and tests.

alexcrichton · 2019-05-08T13:57:00Z

@bors: r+

Ok sounds good to me! I think it makes sense to follow the same conventions across the board wherever possible.

bors · 2019-05-08T13:57:02Z

📌 Commit 58624ed has been approved by alexcrichton

@alexcrichton

…hton Omit the vendor component in the WASI triple This renames wasm32-unknown-wasi to wasm32-wasi, omitting the vendor component. This follows aarch64-linux-android, x86_64-fuchsia, and others in omitting the vendor field, which has the advantage of aligning with the [multiarch tuple](https://wiki.debian.org/Multiarch/Tuples), and of being less noisy. r? @alexcrichton

@alexcrichton

…hton Omit the vendor component in the WASI triple This renames wasm32-unknown-wasi to wasm32-wasi, omitting the vendor component. This follows aarch64-linux-android, x86_64-fuchsia, and others in omitting the vendor field, which has the advantage of aligning with the [multiarch tuple](https://wiki.debian.org/Multiarch/Tuples), and of being less noisy. r? @alexcrichton

emilyalbini · 2019-05-08T19:14:23Z

@bors r-

We can't update the dist-various-2 image since it's on an EOL Ubuntu release (17.10). Can you try to bump it to 18.04?

emilyalbini · 2019-05-09T08:37:59Z

Thanks!

@bors r=alexcrichton rollup=never

bors · 2019-05-09T08:38:00Z

📌 Commit 84e3d8e479551c8d73a9753954ea1856265c1bf3 has been approved by alexcrichton

bors · 2019-05-09T08:38:15Z

⌛ Testing commit 84e3d8e479551c8d73a9753954ea1856265c1bf3 with merge 63ff0da517271bb0dd1e027b322e3364ae2b8573...

rust-highfive · 2019-05-09T08:42:08Z

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[00:01:05] readline-common tex-common ucf
[00:01:05] Suggested packages:
[00:01:05] autoconf-archive gnu-standards autoconf-doc gettext binutils-doc bison-doc
[00:01:05] cmake-doc ninja-build cpp-doc gcc-7-locales debian-keyring build-essential
[00:01:05] flex-doc g++-multilib g++-7-multilib gcc-7-doc libstdc++6-7-dbg gawk-doc
[00:01:05] libitm1-dbg libatomic1-dbg libasan4-dbg liblsan0-dbg libtsan0-dbg
[00:01:05] libubsan0-dbg libcilkrts5-dbg libmpx2-dbg libquadmath0-dbg gdb-doc
[00:01:05] gettext-base git-daemon-run | git-daemon-sysvinit git-doc git-el git-email
[00:01:05] git-gui gitk gitweb git-cvs git-mediawiki git-svn lrzip glibc-doc gnupg
---
[00:01:28] Setting up libmpc3:amd64 (1.1.0-1) ...
[00:01:28] Setting up libc-dev-bin (2.27-3ubuntu1) ...
[00:01:28] Setting up bison (2:3.0.4.dfsg-1build1) ...
[00:01:28] update-alternatives: using /usr/bin/bison.yacc to provide /usr/bin/yacc (yacc) in auto mode
[00:01:28] update-alternatives: warning: skip creation of /usr/share/man/man1/yacc.1.gz because associated file /usr/share/man/man1/bison.yacc.1.gz (of link group yacc) doesn't exist
[00:01:28] Setting up libkeyutils1:amd64 (1.5.9-9.2ubuntu2) ...
[00:01:28] Setting up libpython2.7-minimal:amd64 (2.7.15~rc1-1ubuntu0.1) ...
[00:01:28] Setting up ca-certificates (20180409) ...
[00:01:29] debconf: unable to initialize frontend: Dialog
---
[00:01:31] Setting up dpkg-dev (1.19.0.5ubuntu2.1) ...
[00:01:31] Setting up libldap-2.4-2:amd64 (2.4.45+dfsg-1ubuntu1.2) ...
[00:01:31] Setting up automake (1:1.15.1-3ubuntu2) ...
[00:01:31] update-alternatives: using /usr/bin/automake-1.15 to provide /usr/bin/automake (automake) in auto mode
[00:01:31] update-alternatives: warning: skip creation of /usr/share/man/man1/automake.1.gz because associated file /usr/share/man/man1/automake-1.15.1.gz (of link group automake) doesn't exist
[00:01:31] update-alternatives: warning: skip creation of /usr/share/man/man1/aclocal.1.gz because associated file /usr/share/man/man1/aclocal-1.15.1.gz (of link group automake) doesn't exist
[00:01:31] update-alternatives: using /usr/bin/g++ to provide /usr/bin/c++ (c++) in auto mode
[00:01:31] update-alternatives: warning: skip creation of /usr/share/man/man1/c++.1.gz because associated file /usr/share/man/man1/g++.1.gz (of link group c++) doesn't exist
[00:01:31] Setting up gdb (8.1-0ubuntu3) ...
[00:01:31] Setting up libxml-sax-perl (0.99+dfsg-2ubuntu1) ...
---
[00:01:40] ---> ed72928b9c16
[00:01:40] Step 4/39 : RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends build-essential gcc-multilib libedit-dev libgmp-dev libisl-dev libmpc-dev libmpfr-dev ninja-build nodejs python2.7-dev software-properties-common unzip
[00:01:40] ---> Running in bf997ee48ce9
[00:01:41] Reading package lists...
[00:01:41] E: You must put some 'source' URIs in your sources.list
[00:01:41] The command '/bin/sh -c apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends build-essential gcc-multilib libedit-dev libgmp-dev libisl-dev libmpc-dev libmpfr-dev ninja-build nodejs python2.7-dev software-properties-common unzip' returned a non-zero code: 100
[00:01:43] Sending build context to Docker daemon 520.7kB
[00:01:43] Step 1/39 : FROM ubuntu:18.04
[00:01:43] ---> d131e0fa2585
[00:01:43] Step 2/39 : COPY scripts/cross-apt-packages.sh /scripts/
---
[00:01:43] ---> ed72928b9c16
[00:01:43] Step 4/39 : RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends build-essential gcc-multilib libedit-dev libgmp-dev libisl-dev libmpc-dev libmpfr-dev ninja-build nodejs python2.7-dev software-properties-common unzip
[00:01:43] ---> Running in 9fadf41f1ab8
[00:01:44] Reading package lists...
[00:01:44] E: You must put some 'source' URIs in your sources.list
[00:01:44] The command '/bin/sh -c apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends build-essential gcc-multilib libedit-dev libgmp-dev libisl-dev libmpc-dev libmpfr-dev ninja-build nodejs python2.7-dev software-properties-common unzip' returned a non-zero code: 100
[00:01:46] Sending build context to Docker daemon 520.7kB
[00:01:46] Step 1/39 : FROM ubuntu:18.04
[00:01:46] ---> d131e0fa2585
[00:01:46] Step 2/39 : COPY scripts/cross-apt-packages.sh /scripts/
---
[00:01:46] ---> ed72928b9c16
[00:01:46] Step 4/39 : RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends build-essential gcc-multilib libedit-dev libgmp-dev libisl-dev libmpc-dev libmpfr-dev ninja-build nodejs python2.7-dev software-properties-common unzip
[00:01:47] ---> Running in 5e8b452a134a
[00:01:48] Reading package lists...
[00:01:48] E: You must put some 'source' URIs in your sources.list
[00:01:48] The command '/bin/sh -c apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends build-essential gcc-multilib libedit-dev libgmp-dev libisl-dev libmpc-dev libmpfr-dev ninja-build nodejs python2.7-dev software-properties-common unzip' returned a non-zero code: 100
[00:01:51] Sending build context to Docker daemon 520.7kB
[00:01:51] Step 1/39 : FROM ubuntu:18.04
[00:01:51] ---> d131e0fa2585
[00:01:51] Step 2/39 : COPY scripts/cross-apt-packages.sh /scripts/
---
[00:01:51] ---> ed72928b9c16
[00:01:51] Step 4/39 : RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends build-essential gcc-multilib libedit-dev libgmp-dev libisl-dev libmpc-dev libmpfr-dev ninja-build nodejs python2.7-dev software-properties-common unzip
[00:01:51] ---> Running in 736088e22b09
[00:01:53] Reading package lists...
[00:01:53] E: You must put some 'source' URIs in your sources.list
[00:01:53] The command '/bin/sh -c apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends build-essential gcc-multilib libedit-dev libgmp-dev libisl-dev libmpc-dev libmpfr-dev ninja-build nodejs python2.7-dev software-properties-common unzip' returned a non-zero code: 100
[00:01:57] Sending build context to Docker daemon 520.7kB
[00:01:57] Step 1/39 : FROM ubuntu:18.04
[00:01:57] ---> d131e0fa2585
[00:01:57] Step 2/39 : COPY scripts/cross-apt-packages.sh /scripts/
---
[00:01:57] ---> ed72928b9c16
[00:01:57] Step 4/39 : RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends build-essential gcc-multilib libedit-dev libgmp-dev libisl-dev libmpc-dev libmpfr-dev ninja-build nodejs python2.7-dev software-properties-common unzip
[00:01:57] ---> Running in f0aa0b69667b
[00:01:59] Reading package lists...
[00:01:59] E: You must put some 'source' URIs in your sources.list
[00:01:59] The command '/bin/sh -c apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends build-essential gcc-multilib libedit-dev libgmp-dev libisl-dev libmpc-dev libmpfr-dev ninja-build nodejs python2.7-dev software-properties-common unzip' returned a non-zero code: 100
travis_time:end:066d3200:start=1557391174303231325,finish=1557391293981885728,duration=119678654403
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 1.
travis_time:start:19819cc0
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:0f4bead0:start=1557391294711557553,finish=1557391294717371365,duration=5813812
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1bc2204e
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0010fbc0
travis_time:start:0010fbc0
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:13cbb6c4
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-05-09T08:42:10Z

💔 Test failed - checks-travis

emilyalbini · 2019-05-09T09:05:59Z

I'm working on a PR to properly upgrade that image to Ubuntu 18.04.

emilyalbini · 2019-05-09T09:58:26Z

Blocked on #60665.

Also, can you remove the Ubuntu version bump commit? It's already included in the PR I linked.

This renames wasm32-unknown-wasi to wasm32-wasi, omitting the vendor component. This follows aarch64-linux-android, x86_64-fuchsia, and others in omitting the vendor field, which has the advantage of aligning with the [multiarch tuple](https://wiki.debian.org/Multiarch/Tuples), and of being less noisy.

sunfishcode · 2019-05-09T18:36:15Z

Ok, I removed the Ubuntu version bump commit.

emilyalbini · 2019-05-10T06:47:06Z

Not blocked anymore 🎉

@bors r=alexcrichton rollup=never

bors · 2019-05-10T06:47:07Z

📌 Commit 1fe3ce1 has been approved by alexcrichton

bors · 2019-05-10T07:02:45Z

⌛ Testing commit 1fe3ce1 with merge c441b8a...

@alexcrichton

Omit the vendor component in the WASI triple This renames wasm32-unknown-wasi to wasm32-wasi, omitting the vendor component. This follows aarch64-linux-android, x86_64-fuchsia, and others in omitting the vendor field, which has the advantage of aligning with the [multiarch tuple](https://wiki.debian.org/Multiarch/Tuples), and of being less noisy. r? @alexcrichton

bors · 2019-05-10T09:56:50Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing c441b8a to master...

- WASI is now categorized as an OS rather than an environment. (rust-lang/rust#60117) - The WASI triple is renamed from wasm32-unknown-wasi to wasm32-wasi. (rust-lang/rust#60585)

sunfishcode requested a review from alexcrichton May 6, 2019 17:11

rust-highfive assigned alexcrichton May 6, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 6, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 8, 2019

Centril mentioned this pull request May 8, 2019
Rollup of 6 pull requests #60640
Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 8, 2019

Centril mentioned this pull request May 8, 2019
Rollup of 4 pull requests #60636
Closed

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 9, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 9, 2019

emilyalbini added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 9, 2019

sunfishcode force-pushed the wasm32-wasi branch from 84e3d8e to 1fe3ce1Compare May 9, 2019 18:35

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels May 10, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label May 10, 2019

bors merged commit 1fe3ce1 into rust-lang:masterMay 10, 2019

sunfishcode deleted the wasm32-wasi branch May 11, 2019 12:31

This was referenced May 11, 2019
Support wasm32-unknown-wasi and x86_64-apple-macosx10.7.0 bytecodealliance/target-lexicon#14
Merged
Recognize the "wasm32-wasi" target tuple. rust-lang/cc-rs#402
Merged

sunfishcode mentioned this pull request May 15, 2019
Update the WASI support. rust-random/getrandom#22
Merged

mati865 mentioned this pull request May 16, 2019
Update to the latest wasi-sysroot. rust-lang/libc#1342
Merged

bjorn3 mentioned this pull request May 16, 2019
Disable compilation of miniz-sys on WASI rust-lang/flate2-rs#194
Merged

sunfishcode mentioned this pull request Jun 4, 2019
Note that Rust stable supports WASI as of 1.35 CraneStation/wasi#3
Merged

davidtwco mentioned this pull request Sep 20, 2023
target tier policy compliance #116004
Closed

Uh oh!

Uh oh!

Conversation

sunfishcode commented May 6, 2019

Uh oh!

alexcrichton commented May 6, 2019

Uh oh!

sunfishcode commented May 6, 2019

Uh oh!

alexcrichton commented May 8, 2019

Uh oh!

bors commented May 8, 2019

Uh oh!

emilyalbini commented May 8, 2019

Uh oh!

emilyalbini commented May 9, 2019

Uh oh!

bors commented May 9, 2019

Uh oh!

bors commented May 9, 2019

Uh oh!

rust-highfive commented May 9, 2019

Uh oh!

bors commented May 9, 2019

Uh oh!

emilyalbini commented May 9, 2019

Uh oh!

emilyalbini commented May 9, 2019

Uh oh!

sunfishcode commented May 9, 2019

Uh oh!

emilyalbini commented May 10, 2019

Uh oh!

bors commented May 10, 2019

Uh oh!

bors commented May 10, 2019

Uh oh!

bors commented May 10, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants