rustbuild: Support specifying archiver and linker explicitly by petrochenkov · Pull Request #45191 · rust-lang/rust

petrochenkov · 2017-10-10T23:50:41Z

With this patch x.py test passes without toolchain being in PATH if cc, cxx, ar, linker and gdb are specified in config.toml (except for a few run-make tests using nm).

Fixes#41821
r? @Mark-Simulacrum

Mark-Simulacrum

r=me pending review of the base PR, at least in terms of logic seeming sound. Not familiar enough with linkers and such to judge that part, but if it works, I'm happy with it.

Mark-Simulacrum · 2017-10-11T00:26:09Z

I'd prefer this logic to be in src/bin/rustdoc.rs and we can just set RUSTDOC_LINKER here.

Hm, this could actually solve the issue with doctests as well if I understand correctly.

petrochenkov · 2017-10-12T16:37:44Z

To give some background, I need to build Rust on a Linux server 1) using specific toolchain that is not in PATH 2) that toolchain has c++, but doesn't have cc (only gcc) and doesn't have ar (only gar and gcc-ar wrapper) 3) there's another toolchain in PATH, but it's ancient and unusable.

Without this patch my workaround looks roughly like this (in shell pseudocode):

mkdir my_toolchain
ln -s actual_toolchain/gcc my_toolchain/cc
ln -s actual_toolchain/gar my_toolchain/ar
export PATH=my_toolchain:actual_toolchain:$PATH
./x.py build

Even ignoring ar, setting export CC=gcc (or cc = gcc in config.toml) is not enough because rustc will still attempt to use cc for linking Rust code and fail.

bors · 2017-10-13T01:38:38Z

☔ The latest upstream changes (presumably #45233) made this pull request unmergeable. Please resolve the merge conflicts.

petrochenkov · 2017-10-14T10:23:12Z

@bors r=Mark-Simulacrum

bors · 2017-10-14T10:23:13Z

📌 Commit 399ff29 has been approved by Mark-Simulacrum

bors · 2017-10-15T01:33:10Z

⌛ Testing commit 399ff290c65df4a0f0381436a67c18b17f456fbc with merge 05c72874fef283a9dd41b2337b3cbef0e74404d5...

bors · 2017-10-15T02:20:10Z

💔 Test failed - status-travis

kennytm · 2017-10-15T06:04:19Z

Failed to find the symbol res_init in dist-x86_64-musl when building stage2-std (gnu → musl), legit. (needs to link to libresolv?)

Details

[00:42:45] error: linking with `/musl-x86_64/bin/musl-gcc` failed: exit code: 1
[00:42:45] |
[00:42:45] = note: "/musl-x86_64/bin/musl-gcc" "-Wl,--as-needed" "-Wl,-z,noexecstack" "-m64" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/build/unwind-4fb8ab0cb26a92ad/build_script_build-4fb8ab0cb26a92ad.0.o" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/build/unwind-4fb8ab0cb26a92ad/build_script_build-4fb8ab0cb26a92ad" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/build/unwind-4fb8ab0cb26a92ad/build_script_build-4fb8ab0cb26a92ad.crate.allocator.o" "-Wl,--gc-sections" "-pie" "-Wl,-z,relro,-z,now" "-Wl,-O1" "-nodefaultlibs" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-Wl,-Bstatic" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-ee965bf30dd84348.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand-11d028a4b5a1ee6a.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc_jemalloc-2e20520a7c184bee.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc_system-ea2f43e1e71cad7c.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-bb8002df75b7c03d.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-d5bdce442262816c.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-74bec6c5a1a4a26e.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-dbb735482143346f.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_unicode-646edc526b22cddf.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-beef29bda9c153db.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-1a1fb4116f61f74c.rlib" "-Wl,-Bdynamic" "-l" "dl" "-l" "rt" "-l" "pthread" "-l" "pthread" "-l" "gcc_s" "-l" "c" "-l" "m" "-l" "rt" "-l" "pthread" "-l" "util"
[00:42:45] = note: /usr/bin/ld: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-ee965bf30dd84348.rlib(std-ee965bf30dd84348.0.o): undefined reference to symbol '__res_init@@GLIBC_2.2.5'
[00:42:45] //lib/x86_64-linux-gnu/libc.so.6: error adding symbols: DSO missing from command line
[00:42:45] collect2: error: ld returned 1 exit status
[00:42:45] [00:42:45] [00:42:45] error: aborting due to previous error
[00:42:45] [00:42:45] error: Could not compile `unwind`.

bors · 2017-10-15T08:42:41Z

☔ The latest upstream changes (presumably #45224) made this pull request unmergeable. Please resolve the merge conflicts.

petrochenkov · 2017-10-15T20:24:24Z

@bors r=Mark-Simulacrum

bors · 2017-10-15T20:24:25Z

📌 Commit 89d9ce4 has been approved by Mark-Simulacrum

bors · 2017-10-15T22:34:54Z

⌛ Testing commit 89d9ce4 with merge c09beac4654260fd53eb18db449229e7bb9c8385...

bors · 2017-10-15T23:18:11Z

💔 Test failed - status-travis

petrochenkov · 2017-10-16T00:26:56Z

Oops, that was silly.
@bors r=Mark-Simulacrum

bors · 2017-10-16T00:26:57Z

📌 Commit 0577b60 has been approved by Mark-Simulacrum

bors · 2017-10-16T00:32:28Z

⌛ Testing commit 0577b60 with merge 9223c39...

@Mark-Simulacrum

rustbuild: Support specifying archiver and linker explicitly With this patch `x.py test` passes without toolchain being in `PATH` if `cc`, `cxx`, `ar`, `linker` and `gdb` are specified in `config.toml` (except for a few `run-make` tests using `nm`). Fixes#41821 r? @Mark-Simulacrum

bors · 2017-10-16T03:02:01Z

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 9223c39 to master...

Fix compilation after rust-lang/rust#45191

I believe this was forgotten from rust-lang#45191 but hopefully is a simple fix!

rustbuild: Build tests with LLD if `use-lld = true` was passed Addresses rust-lang#76127 (comment). Our test suite is generally ready to run with an explicitly specified linker (rust-lang#45191), so LLD specified with `use-lld = true` works as well. Only 4 tests fail (on `x86_64-pc-windows-msvc`): ``` ui/panic-runtime/lto-unwind.rs run-make-fulldeps/debug-assertions run-make-fulldeps/foreign-exceptions run-make-fulldeps/test-harness ``` All of them are legitimate issues with LLD (or at least with combination Rust+LLD) and manifest in segfaults on access to TLS (rust-lang#76127 (comment)). UPD: These issues are caused by rust-lang#72145 and appear because I had `-Ctarget-cpu=native` set. UPD: Further commits build tests with LLD for non-MSVC targets and propagate LLD to more places when `use-lld` is enabled.

rust-highfive assigned Mark-Simulacrum Oct 10, 2017

Mark-Simulacrum approved these changes Oct 11, 2017
View reviewed changes

petrochenkov force-pushed the yesar branch from 3597ad9 to 3444b77Compare October 11, 2017 22:53

aidanhs added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 12, 2017

kennytm 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 14, 2017

petrochenkov force-pushed the yesar branch from 3444b77 to 399ff29Compare October 14, 2017 10:22

kennytm 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 Oct 14, 2017

kennytm 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 Oct 15, 2017

petrochenkov added 2 commits October 15, 2017 22:10

rustbuild: Support specifying archiver and linker explicitly
9e0fc5c

Don't use target's linker when linking build scripts
89d9ce4

petrochenkov force-pushed the yesar branch from 399ff29 to 89d9ce4Compare October 15, 2017 20:23

Re-enable linker override for cross-compilation
0577b60

bors merged commit 0577b60 into rust-lang:masterOct 16, 2017

o01eg added a commit to o01eg/gentoo-rust that referenced this pull request Oct 17, 2017
Fix compilation afterrust-lang/rust#45191
fc4dadb

Cynede added a commit to gentoo/gentoo-rust that referenced this pull request Oct 17, 2017
Merge pull request#293from o01eg/master
b3c2b57
Fix compilation after rust-lang/rust#45191

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Nov 21, 2017
rustbuild: Allow using unstable rustdoc features on beta
af4a78b
I believe this was forgotten from rust-lang#45191 but hopefully is a simple fix!

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Jan 2, 2018
rustbuild: Allow using unstable rustdoc features on beta
d5c7ba8
I believe this was forgotten from rust-lang#45191 but hopefully is a simple fix!

alexcrichton mentioned this pull request Jan 28, 2019
Do not set CC, CFLAGS, CXX, CXXFLAGS, AR, RANLIB in bootstrap, it breaks cross compilation #57953
Merged

petrochenkov deleted the yesar branch June 5, 2019 15:56

andjo403 mentioned this pull request Aug 28, 2019
RustDoc: remove the redundant unstable option "--linker" #63816
Closed

petrochenkov mentioned this pull request Sep 5, 2020
rustbuild: Build tests with LLD if use-lld = true was passed #76378
Merged

bjorn3 mentioned this pull request May 15, 2022
[config.toml] should not assume ar uses the same prefix as cc for target #39093
Closed

Kobzol mentioned this pull request Oct 5, 2023
Pass rustc shim flags using environment variable #116448
Merged

Uh oh!

Uh oh!

Conversation

petrochenkov commented Oct 10, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Mark-Simulacrum left a comment

Choose a reason for hiding this comment

Uh oh!

Mark-SimulacrumOct 11, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

petrochenkovOct 11, 2017

Choose a reason for hiding this comment

Uh oh!

petrochenkov commented Oct 12, 2017

Uh oh!

bors commented Oct 13, 2017

Uh oh!

petrochenkov commented Oct 14, 2017

Uh oh!

bors commented Oct 14, 2017

Uh oh!

bors commented Oct 15, 2017

Uh oh!

bors commented Oct 15, 2017

Uh oh!

kennytm commented Oct 15, 2017

Uh oh!

bors commented Oct 15, 2017

Uh oh!

petrochenkov commented Oct 15, 2017

Uh oh!

bors commented Oct 15, 2017

Uh oh!

bors commented Oct 15, 2017

Uh oh!

bors commented Oct 15, 2017

Uh oh!

petrochenkov commented Oct 16, 2017

Uh oh!

bors commented Oct 16, 2017

Uh oh!

bors commented Oct 16, 2017

Uh oh!

bors commented Oct 16, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

petrochenkov commented Oct 10, 2017•
edited
Loading

Mark-SimulacrumOct 11, 2017•
edited
Loading