ci: Use rustc docker image for x86_64 and i686 linux#1815
Merged
kinnison merged 1 commit intorust-lang:masterfrom May 5, 2019
Merged
ci: Use rustc docker image for x86_64 and i686 linux#1815kinnison merged 1 commit intorust-lang:masterfrom
kinnison merged 1 commit intorust-lang:masterfrom
Conversation
kinnison
approved these changes
Apr 28, 2019
Contributor
kinnison
left a comment
kinnison
left a comment
There was a problem hiding this comment.
Over-all I like this a lot. It feels right to me to be using the same docker image sources everywhere.
@alexcrichton how do you feel about this? I'm guessing positive?
(tentative approval, but I'd like at least one other docker-conversant person to have final approval)
| RUN make -j$(nproc) | ||
| RUN make install | ||
| FROM rust-i686-unknown-linux-gnu | ||
| RUN ln /rustroot/bin/gcc /rustroot/bin/cc |
Contributor
There was a problem hiding this comment.
Is there a nicer, perhaps package-managery way we can have this work?
Member
There was a problem hiding this comment.
There is no package manager involved here.
Setting environment variable CC=/rustroot/bin/gcc should work.
Contributor
Author
There was a problem hiding this comment.
No, setting CC env doesn't seem to work. Maybe cc crate doesn't respect
CC env?
Contributor
Author
There was a problem hiding this comment.
$ printenv CC CXX
clang
clang++CC is set to clang and we still had the build error.
Member
There was a problem hiding this comment.
Ah, the target is explicitly configured: https://github.com/rust-lang/rustup.rs/blob/66c4d10871edc307865db031483f2bd799abbba3/ci/run.sh#L9
So it'd be CC_x86_64-unknown-linux-gnu for x84_64.
I don't know exact error but if it was the linker then RUSTFLAGS="-C linker=gcc" would help but this is getting a bit complex.
Contributor
Author
There was a problem hiding this comment.
Is CC_x86_64-unknown-linux-gnu standard or it's just used by cc crate?
Contributor
Author
There was a problem hiding this comment.
The error message is
Running `rustc --crate-name semver_parser /src/target/cargo-home/registry/src/github.com-1ecc6299db9ec823/semver-parser-0.7.0/src/lib.rs --color always --crate-type lib --emit=dep-info,link -C opt-level=3 -C codegen-units=1 -C metadata=c7af5d73bcae4fa9 -C extra-filename=-c7af5d73bcae4fa9 --out-dir /src/target/release/deps -L dependency=/src/target/release/deps --cap-lints allow`
error: linker `cc` not found
|
= note: No such file or directory (os error 2)
Member
There was a problem hiding this comment.
Is CC_x86_64-unknown-linux-gnu standard or it's just used by cc crate?
As far as I can tell it's used by cc-rs and Rust's bootstrap.
The error message is
That's the linker error so RUSTFLAGS="-C linker=gcc" would work.
Contributor
Author
There was a problem hiding this comment.
I still think about it: Why does rustc's docker image have no cc hard link?
It is common that cc hard link to gcc on Linux distro.
Contributor
Author
|
Blocked by rust-lang/rust#60366 |
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Apr 29, 2019
build-gcc: Create missing cc hard link
This PR mostly fixes build error caused by using rustc docker images
to build [rustup][1] (with the error: ``linker `cc` not found``).
I don't know why gcc build script doesn't install cc hard link by default.
In build log, with `make SHELL='sh -x' install`, gcc build script installs c++
hard link but not `cc` one:
```bash
if test "" != "yes" ; then \
rm -f /rustroot/bin/g++; \
/usr/bin/install -c xg++ /rustroot/bin/g++; \
chmod a+x /rustroot/bin/g++; \
rm -f /rustroot/bin/c++; \
( cd /rustroot/bin && \
ln g++ c++ ); \
if [ -f cc1plus ] ; then \
if [ ! -f g++-cross ] ; then \
rm -f /rustroot/bin/x86_64-unknown-linux-gnu-g++; \
( cd /rustroot/bin && \
ln g++ x86_64-unknown-linux-gnu-g++ ); \
rm -f /rustroot/bin/x86_64-unknown-linux-gnu-c++; \
( cd /rustroot/bin && \
ln c++ x86_64-unknown-linux-gnu-c++ ); \
fi ; \
fi; \
fi
```
This might be fixed downstream by manually creating cc hard link
or setting `RUSTFLAGS="-C linker=gcc"` as [suggested by @mati865][2].
But I find it better to fix it upstream in this PR.
[1]: rust-lang/rustup#1815
[2]: rust-lang/rustup#1815 (comment)
alexcrichton
approved these changes
Apr 29, 2019
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 1, 2019
build-gcc: Create missing cc symlink
This PR mostly fixes build error caused by using rustc docker images
to build [rustup][1] (with the error: ``linker `cc` not found``).
I don't know why gcc build script doesn't install cc hard link by default.
In build log, with `make SHELL='sh -x' install`, gcc build script installs c++
hard link but not `cc` one:
```bash
if test "" != "yes" ; then \
rm -f /rustroot/bin/g++; \
/usr/bin/install -c xg++ /rustroot/bin/g++; \
chmod a+x /rustroot/bin/g++; \
rm -f /rustroot/bin/c++; \
( cd /rustroot/bin && \
ln g++ c++ ); \
if [ -f cc1plus ] ; then \
if [ ! -f g++-cross ] ; then \
rm -f /rustroot/bin/x86_64-unknown-linux-gnu-g++; \
( cd /rustroot/bin && \
ln g++ x86_64-unknown-linux-gnu-g++ ); \
rm -f /rustroot/bin/x86_64-unknown-linux-gnu-c++; \
( cd /rustroot/bin && \
ln c++ x86_64-unknown-linux-gnu-c++ ); \
fi ; \
fi; \
fi
```
This might be fixed downstream by manually creating cc hard link
or setting `RUSTFLAGS="-C linker=gcc"` as [suggested by @mati865][2].
But I find it better to fix it upstream in this PR.
[1]: rust-lang/rustup#1815
[2]: rust-lang/rustup#1815 (comment)
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 1, 2019
build-gcc: Create missing cc symlink
This PR mostly fixes build error caused by using rustc docker images
to build [rustup][1] (with the error: ``linker `cc` not found``).
I don't know why gcc build script doesn't install cc hard link by default.
In build log, with `make SHELL='sh -x' install`, gcc build script installs c++
hard link but not `cc` one:
```bash
if test "" != "yes" ; then \
rm -f /rustroot/bin/g++; \
/usr/bin/install -c xg++ /rustroot/bin/g++; \
chmod a+x /rustroot/bin/g++; \
rm -f /rustroot/bin/c++; \
( cd /rustroot/bin && \
ln g++ c++ ); \
if [ -f cc1plus ] ; then \
if [ ! -f g++-cross ] ; then \
rm -f /rustroot/bin/x86_64-unknown-linux-gnu-g++; \
( cd /rustroot/bin && \
ln g++ x86_64-unknown-linux-gnu-g++ ); \
rm -f /rustroot/bin/x86_64-unknown-linux-gnu-c++; \
( cd /rustroot/bin && \
ln c++ x86_64-unknown-linux-gnu-c++ ); \
fi ; \
fi; \
fi
```
This might be fixed downstream by manually creating cc hard link
or setting `RUSTFLAGS="-C linker=gcc"` as [suggested by @mati865][2].
But I find it better to fix it upstream in this PR.
[1]: rust-lang/rustup#1815
[2]: rust-lang/rustup#1815 (comment)
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 1, 2019
build-gcc: Create missing cc symlink
This PR mostly fixes build error caused by using rustc docker images
to build [rustup][1] (with the error: ``linker `cc` not found``).
I don't know why gcc build script doesn't install cc hard link by default.
In build log, with `make SHELL='sh -x' install`, gcc build script installs c++
hard link but not `cc` one:
```bash
if test "" != "yes" ; then \
rm -f /rustroot/bin/g++; \
/usr/bin/install -c xg++ /rustroot/bin/g++; \
chmod a+x /rustroot/bin/g++; \
rm -f /rustroot/bin/c++; \
( cd /rustroot/bin && \
ln g++ c++ ); \
if [ -f cc1plus ] ; then \
if [ ! -f g++-cross ] ; then \
rm -f /rustroot/bin/x86_64-unknown-linux-gnu-g++; \
( cd /rustroot/bin && \
ln g++ x86_64-unknown-linux-gnu-g++ ); \
rm -f /rustroot/bin/x86_64-unknown-linux-gnu-c++; \
( cd /rustroot/bin && \
ln c++ x86_64-unknown-linux-gnu-c++ ); \
fi ; \
fi; \
fi
```
This might be fixed downstream by manually creating cc hard link
or setting `RUSTFLAGS="-C linker=gcc"` as [suggested by @mati865][2].
But I find it better to fix it upstream in this PR.
[1]: rust-lang/rustup#1815
[2]: rust-lang/rustup#1815 (comment)
Contributor
Author
|
Ok. Ready to merge 🎉 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cc @kinnison , @alexcrichton
So the effort of improving CI time is zero for now(#1760)The next PR might be setting up sccache.