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.

Sign up for GitHub

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

Jump to bottom

Backport rust 1.26 from master. #41903

Merged
merged 1 commit into from Jun 13, 2018
Merged

Backport rust 1.26 from master. #41903

merged 1 commit into from Jun 13, 2018

Conversation

shlevy
Copy link
Member

@shlevy shlevy commented Jun 12, 2018

As of 4752959.

@shlevy
Copy link
Member Author

shlevy commented Jun 12, 2018

cc @Havvy

@shlevy
Copy link
Member Author

shlevy commented Jun 12, 2018

@GrahamcOfBorg build rust_1_26.rustc

@shlevy
Copy link
Member Author

shlevy commented Jun 12, 2018

(build still running locally)

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: rust_1_26.rustc

Partial log (click to expand)

updateAutotoolsGnuConfigScriptsPhase
configuring
no configure script, doing nothing
building
no Makefile, doing nothing
installing
install: error: unknown component: rust-docs
builder for '/nix/store/zk79r404ckmaz6ba4cp28c6ks0m6v32k-rustc-bootstrap-1.26.1.drv' failed with exit code 1
cannot build derivation '/nix/store/hz8853paapafnjv5wgxb1n4c00l1d524-rustc-1.26.2.drv': 1 dependencies couldn't be built
error: build of '/nix/store/hz8853paapafnjv5wgxb1n4c00l1d524-rustc-1.26.2.drv' failed

@shlevy
Copy link
Member Author

shlevy commented Jun 12, 2018

@GrahamcOfBorg build rust_1_26.cargo

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: rust_1_26.rustc

Partial log (click to expand)

[ 91%] Built target llvm-as
[ 91%] Building CXX object tools/bugpoint/CMakeFiles/bugpoint.dir/bugpoint.cpp.o
make[3]: Entering directory '/private/tmp/nix-build-rustc-1.26.2.drv-0/rustc-1.26.2-src/build/x86_64-apple-darwin/llvm/build'
Scanning dependencies of target llvm-bcanalyzer
make[3]: Leaving directory '/private/tmp/nix-build-rustc-1.26.2.drv-0/rustc-1.26.2-src/build/x86_64-apple-darwin/llvm/build'
make[3]: Entering directory '/private/tmp/nix-build-rustc-1.26.2.drv-0/rustc-1.26.2-src/build/x86_64-apple-darwin/llvm/build'
[ 91%] Building CXX object tools/llvm-bcanalyzer/CMakeFiles/llvm-bcanalyzer.dir/llvm-bcanalyzer.cpp.o
[ 91%] Building CXX object tools/dsymutil/CMakeFiles/llvm-dsymutil.dir/MachODebugMapParser.cpp.o
building of '/nix/store/xmiwjrp0yfhyq0f2f09p1qp685xa8j8y-rustc-1.26.2.drv' timed out after 1800 seconds
error: build of '/nix/store/xmiwjrp0yfhyq0f2f09p1qp685xa8j8y-rustc-1.26.2.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: rust_1_26.cargo

Partial log (click to expand)

make[3]: Entering directory '/build/rustc-1.26.2-src/build/x86_64-unknown-linux-gnu/llvm/build'
[ 74%] Building CXX object lib/Target/MSP430/CMakeFiles/LLVMMSP430CodeGen.dir/MSP430BranchSelector.cpp.o
[ 74%] Building CXX object lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCTLSDynamicCall.cpp.o
[ 74%] Building CXX object lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCVSXCopy.cpp.o
[ 74%] Building CXX object lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCReduceCRLogicals.cpp.o
[ 74%] Building CXX object lib/Target/MSP430/CMakeFiles/LLVMMSP430CodeGen.dir/MSP430ISelDAGToDAG.cpp.o
[ 74%] Building CXX object lib/Target/PowerPC/CMakeFiles/LLVMPowerPCCodeGen.dir/PPCVSXFMAMutate.cpp.o
building of '/nix/store/0rqsqi2mhbl45d8nrjhbpjb110gz569w-rustc-1.26.2.drv' timed out after 1800 seconds
cannot build derivation '/nix/store/ip3prwx1ym3980bs3kcnifjvqywvw598-cargo-1.26.2.drv': 1 dependencies couldn't be built
error: build of '/nix/store/ip3prwx1ym3980bs3kcnifjvqywvw598-cargo-1.26.2.drv' failed

@shlevy
Copy link
Member Author

shlevy commented Jun 12, 2018

😭 Guess I'll have to wait for my puny laptop to finish

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: rust_1_26.cargo

Partial log (click to expand)

[ 25%] Building CXX object lib/Transforms/Scalar/CMakeFiles/LLVMScalarOpts.dir/GVNSink.cpp.o
[ 25%] Building CXX object lib/Transforms/Scalar/CMakeFiles/LLVMScalarOpts.dir/IVUsersPrinter.cpp.o
[ 25%] Building CXX object lib/Transforms/Scalar/CMakeFiles/LLVMScalarOpts.dir/InductiveRangeCheckElimination.cpp.o
[ 25%] Building CXX object lib/Transforms/Scalar/CMakeFiles/LLVMScalarOpts.dir/IndVarSimplify.cpp.o
[ 25%] Building CXX object lib/Transforms/Scalar/CMakeFiles/LLVMScalarOpts.dir/InferAddressSpaces.cpp.o
[ 25%] Building CXX object lib/Transforms/Scalar/CMakeFiles/LLVMScalarOpts.dir/JumpThreading.cpp.o
[ 25%] Building CXX object lib/Transforms/Scalar/CMakeFiles/LLVMScalarOpts.dir/LICM.cpp.o
building of '/nix/store/bcxami7klqlzrdjjan6clnqsin6zrbfb-rustc-1.26.2.drv' timed out after 1800 seconds
cannot build derivation '/nix/store/cnnlrfixcczr1mwkm0mppbi8kw4mmwv1-cargo-1.26.2.drv': 1 dependencies couldn't be built
error: build of '/nix/store/cnnlrfixcczr1mwkm0mppbi8kw4mmwv1-cargo-1.26.2.drv' failed

Havvy
Havvy reviewed Jun 12, 2018
View reviewed changes
pkgs/development/compilers/rust/1.26/binaryBuild.nix Outdated
# Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
# (or similar) here. It causes strange effects where rustc loads
# the wrong libraries in a bootstrap-build causing failures that
# are very hard to track dow. For details, see
Copy link
Contributor

Choose a reason for hiding this comment

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

"dow" -> "down"

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks, fixed in afad998

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: rust_1_26.cargo

Partial log (click to expand)

   Compiling rustc_llvm v0.0.0 (file:///build/rustc-1.26.2-src/src/librustc_llvm)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
'+fp' is not a recognized feature for this target (ignoring feature)
building of '/nix/store/88f49fbf0apdyq4vb0zwfi471mqw4w31-rustc-1.26.2.drv' timed out after 3600 seconds
cannot build derivation '/nix/store/dc08vmfv0w2iiias9vv2nsdb3qnkjs0a-cargo-1.26.2.drv': 1 dependencies couldn't be built
error: build of '/nix/store/dc08vmfv0w2iiias9vv2nsdb3qnkjs0a-cargo-1.26.2.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: rust_1_26.rustc

Partial log (click to expand)

test [rustdoc] rustdoc/foreigntype.rs ... ok
test [rustdoc] rustdoc/hidden-line.rs ... ok
test [rustdoc] rustdoc/hidden-methods.rs ... ok
test [rustdoc] rustdoc/hidden-trait-struct-impls.rs ... ok
test [rustdoc] rustdoc/impl-disambiguation.rs ... ok
test [rustdoc] rustdoc/impl-parts.rs ... ok
test [rustdoc] rustdoc/impl-parts-crosscrate.rs ... ok
test [rustdoc] rustdoc/hidden-impls.rs ... ok
building of '/nix/store/b3hn00hkclfl82l4y7i9gvrpadxgfgrc-rustc-1.26.2.drv' timed out after 4000 seconds
error: build of '/nix/store/b3hn00hkclfl82l4y7i9gvrpadxgfgrc-rustc-1.26.2.drv' failed

LnL7
LnL7 approved these changes Jun 12, 2018
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Fine by me, assuming the build doesn't depend on something else from master.

wizeman
wizeman approved these changes Jun 13, 2018
View reviewed changes
Copy link
Member

@wizeman wizeman left a comment •
edited

Choose a reason for hiding this comment

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

I haven't been keeping up with Rust packaging, but assuming it builds and works, it LGTM 👍

@shlevy shlevy merged commit 1d2c750 into NixOS:release-18.03 Jun 13, 2018
@shlevy shlevy deleted the rust-1.26-backport branch June 13, 2018 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Havvy Havvy Havvy left review comments

@wizeman wizeman wizeman approved these changes

@LnL7 LnL7 LnL7 approved these changes

@madjar madjar Awaiting requested review from madjar

@cstrahan cstrahan Awaiting requested review from cstrahan

@globin globin Awaiting requested review from globin

@wkennington wkennington Awaiting requested review from wkennington

@vcunat vcunat Awaiting requested review from vcunat

Assignees
No one assigned
Labels
6.topic: rust 8.has: documentation 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@shlevy @GrahamcOfBorg @wizeman @LnL7 @Havvy