bootstrap/codegen_ssa: ship llvm-strip and use it for -Cstrip #131405

davidtwco · 2024-10-08T14:42:53Z

Includes llvm-strip (a symlink to llvm-objcopy) in the compiler dist artifact so that it can be used for -Cstrip instead of the system tooling.
Uses llvm-strip instead of /usr/bin/strip for macOS. macOS needs a specific linker and the system one is preferred, hence Fix up setting strip = true in Cargo.toml makes build scripts fail in… #130781 but that doesn't work when cross-compiling, so use the llvm-strip utility instead.

rustbot · 2024-10-08T14:43:02Z

rustbot has assigned @albertlarsan68.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

davidtwco · 2024-10-08T14:48:21Z

We could make this same change to the illumos and AIX targets which also hardcode a path to a strip binary. Pinging relevant people for those targets to see if this would be desirable.

@ecnelises @bzEq (listed as target maintainers for powerpc64-ibm-aix
@jclulow (we have no target maintainers for the illumos targets in the documentation, but I've seen @jclulow in the issue tracker and I know is involved in illumos)

src/bootstrap/src/core/build_steps/dist.rs

src/bootstrap/src/core/build_steps/compile.rs

lqd · 2024-10-08T16:37:27Z

src/bootstrap/src/core/builder.rs

@@ -1151,6 +1151,11 @@ impl<'a> Builder<'a> {
 self.ensure(compile::Sysroot::new(compiler))
 }

+ /// Returns the bindir for a compiler's sysroot.


Probably t-bootstrap will have opinions here, because there are 2 "bin" directories 😓

workingjubilee · 2024-10-08T16:48:00Z

Thank you for posting this. I tried twice and couldn't even figure out where to start.

taiki-e · 2024-10-08T16:50:36Z

illumos

AFAIK some change is needed for illumos too because using the default strip binary of Linux host causes a problem (oxidecomputer/helios#147).
However, I have not actually tested to see if using LLVM strip would solve the problem. (This comment may indicate that anything other than native strip utility would not work.)

cc @sunshowers

lqd · 2024-10-08T16:53:42Z

compiler/rustc_codegen_ssa/src/back/link.rs

+ let mut new_path = sess.get_tools_search_paths(false);
+ if let Some(path) = env::var_os("PATH") {
+ new_path.extend(env::split_paths(&path));
+ }
+ cmd.env("PATH", env::join_paths(new_path).unwrap());


also: it's probably safer to look for rust-objcopy in the tools search path and launch w/ the absolute path cmd rather than overriding the $PATH?

It probably is but we override the PATH for rust-lld so I'll keep it this way and we can change both together later.

jclulow · 2024-10-08T17:57:12Z

@jclulow (we have no target maintainers for the illumos targets in the documentation, but I've seen @jclulow in the issue tracker and I know is involved in illumos)

Hey, with my apologies, someone pointed this out to me recently and I owe a PR to fix the docs and list some maintainers there.

We could make this same change to the illumos and AIX targets which also hardcode a path to a strip binary. Pinging relevant people for those targets to see if this would be desirable.

When we're running on an illumos host and compiling for an illumos target, we definitely want to use the system strip binary explicitly. If we're cross compiling, either on an illumos host for a non-illumos target, or on a non-illumos host, I don't have a particular preference and we should do whatever is tested to work there.

Does that make sense?

bzEq · 2024-10-08T22:34:10Z

Thanks for headsup. On AIX, we are still using /usr/bin/strip. llvm-strip is not compatible with AIX's system strip utility.

…nnethercote Fix hardcoded strip path when cross-compiling from Linux to Darwin Fixes rust-lang#131206. I fear that rust-lang#131405 might end up taking some time, so opening this PR to resolve the regression. `@rustbot` label O-apple

Rollup merge of rust-lang#131480 - madsmtm:macos-fix-strip-binary, r=nnethercote Fix hardcoded strip path when cross-compiling from Linux to Darwin Fixes rust-lang#131206. I fear that rust-lang#131405 might end up taking some time, so opening this PR to resolve the regression. `@rustbot` label O-apple

davidtwco · 2024-10-11T13:03:43Z

Thanks for headsup. On AIX, we are still using /usr/bin/strip. llvm-strip is not compatible with AIX's system strip utility.

Okay, I've kept AIX's logic as it is, but I have added a warning when cross-compiling that whatever is in /usr/bin/strip may not work because it isn't AIX's system strip.

When we're running on an illumos host and compiling for an illumos target, we definitely want to use the system strip binary explicitly. If we're cross compiling, either on an illumos host for a non-illumos target, or on a non-illumos host, I don't have a particular preference and we should do whatever is tested to work there.

Does that make sense?

That makes sense. I've kept /usr/bin/strip if not cross-compiling, and we'll now use llvm-strip instead of /usr/bin/strip when cross-compiling (that seems more likely to work reliably than relying on whatever /usr/bin/strip could be). I also changed the condition we used here from target.os == "illumos" to target.is_like_solaris, since that's why we have is_like_solaris in the first place. Let me know if that's not correct and there is some difference with stripping between illumos and solaris in general.

albertlarsan68

LGTM for the technical side in bootstrap

albertlarsan68 · 2024-10-13T15:48:28Z

r? t-compiler for the compiler side of things

rustbot assigned albertlarsan68 Oct 8, 2024

This comment was marked as resolved.

Sign in to view

jieyouxu reviewed Oct 8, 2024

View reviewed changes

src/bootstrap/src/core/build_steps/dist.rs Outdated Show resolved Hide resolved

lqd reviewed Oct 8, 2024

View reviewed changes

src/bootstrap/src/core/build_steps/compile.rs Outdated Show resolved Hide resolved

davidtwco force-pushed the hardcoded-strip-macos branch from 159f31c to eadf0dd Compare October 8, 2024 16:08

lqd reviewed Oct 8, 2024

View reviewed changes

This was referenced Oct 10, 2024

Fix hardcoded strip path when cross-compiling from Linux to Darwin #131480

Merged

Hard-coded strip path breaks Linux -> Darwin builds #131206

Closed

This comment was marked as resolved.

Sign in to view

davidtwco force-pushed the hardcoded-strip-macos branch from eadf0dd to d9b8a78 Compare October 11, 2024 13:01

davidtwco added 2 commits October 11, 2024 15:05

bootstrap: include llvm-objcopy in dist

3985715

codegen_ssa: use llvm-objcopy for macOS strip

89cd82d

davidtwco force-pushed the hardcoded-strip-macos branch from d9b8a78 to 89cd82d Compare October 11, 2024 13:13

albertlarsan68 reviewed Oct 13, 2024

View reviewed changes

rustbot assigned cjgillot and unassigned albertlarsan68 Oct 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bootstrap/codegen_ssa: ship llvm-strip and use it for -Cstrip #131405

bootstrap/codegen_ssa: ship llvm-strip and use it for -Cstrip #131405

davidtwco commented Oct 8, 2024

rustbot commented Oct 8, 2024

davidtwco commented Oct 8, 2024

This comment was marked as resolved.

lqd Oct 8, 2024

workingjubilee commented Oct 8, 2024

taiki-e commented Oct 8, 2024

lqd Oct 8, 2024 •

edited

Loading

davidtwco Oct 11, 2024

jclulow commented Oct 8, 2024

bzEq commented Oct 8, 2024 •

edited

Loading

This comment was marked as resolved.

davidtwco commented Oct 11, 2024

albertlarsan68 left a comment

albertlarsan68 commented Oct 13, 2024

bootstrap/codegen_ssa: ship llvm-strip and use it for -Cstrip #131405

Are you sure you want to change the base?

bootstrap/codegen_ssa: ship llvm-strip and use it for -Cstrip #131405

Conversation

davidtwco commented Oct 8, 2024

rustbot commented Oct 8, 2024

davidtwco commented Oct 8, 2024

This comment was marked as resolved.

lqd Oct 8, 2024

Choose a reason for hiding this comment

workingjubilee commented Oct 8, 2024

taiki-e commented Oct 8, 2024

lqd Oct 8, 2024 • edited Loading

Choose a reason for hiding this comment

davidtwco Oct 11, 2024

Choose a reason for hiding this comment

jclulow commented Oct 8, 2024

bzEq commented Oct 8, 2024 • edited Loading

This comment was marked as resolved.

davidtwco commented Oct 11, 2024

albertlarsan68 left a comment

Choose a reason for hiding this comment

albertlarsan68 commented Oct 13, 2024

lqd Oct 8, 2024 •

edited

Loading

bzEq commented Oct 8, 2024 •

edited

Loading