llvm 5: split out compiler-rt and remove libcxxabi dep #42048
Conversation
Ericson2314
requested review from
copumpkin,
orivej,
LnL7,
dtzWill and
matthewbauer
Ericson2314
force-pushed
the
llvm-5-compiler-rt
branch
from
d23354c
to
417601c
Compare
| buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; | ||
|
|
||
| configureFlags = [ | ||
| "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" |
There was a problem hiding this comment.
Why default target only, just curious?
There was a problem hiding this comment.
IMO one of the big advantages of building compilers and their run-times separately is that you can libraries per-target. This makes it economical to support indefinite variations of targets (especially for e.g. embedded) without wasting time rebuilding the compiler itself.
| ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" | ||
| echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags | ||
| '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' | ||
| echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags |
There was a problem hiding this comment.
Whoa when'd we start doing this?? haha guess I haven't been paying enough attention!
There was a problem hiding this comment.
The build-time equivalent was done before, polluting clang. i changed this to this when working on the first round of compiler-rt stuff with @Ralith.
| inherit (llvmPackages_5) llvm; | ||
| # The .override that was here before had the side affect of removing | ||
| # the hacked-in "man" output. | ||
| clang-unwrapped = builtins.removeAttrs llvmPackages_5.clang-unwrapped [ "man" ]; |
There was a problem hiding this comment.
I think the manpages are in a separate drv now, so we can probably get rid of the extra output.
There was a problem hiding this comment.
For some reason this was causing much more building. Let's investigate this after.
There was a problem hiding this comment.
@Ericson2314 Looks like this breaks the nixpkgs tarball: https://hydra.nixos.org/build/76089043
There was a problem hiding this comment.
Fixed on master with #42174 I'm pretty sure.
| ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" | ||
| echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags | ||
| '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' | ||
| echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags |
There was a problem hiding this comment.
Could we get rid of the gcc attribute? It only works on linux and I think it's pretty confusing.
There was a problem hiding this comment.
Oh but there's some funky cc-wrapper, switch, and emscripten stuff about this too. Nasty all around, but this is big enough already.
| "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" | ||
| ]; | ||
|
|
||
| outputs = [ "dev" "out" ]; |
There was a problem hiding this comment.
Oops. No reason. Good catch.
GrahamcOfBorg
added
6.topic: stdenv
Ericson2314
force-pushed
the
llvm-5-compiler-rt
branch
2 times, most recently
from
f42dab0
to
a6dafe1
Compare
We already did them on non-mass-rebuild llvm 6. Also, this allows simplifying the stdenv booting. We were missing the libcxxabi dep in compile-rt in llvm 6, so fixed that too.
Ericson2314
force-pushed
the
llvm-5-compiler-rt
branch
from
a6dafe1
to
6e7e22d
Compare
Motivation for this change
We already did them on non-mass-rebuild llvm 6. Also, this allows simplifying the stdenv booting.
We were missing the libcxxabi dep in compile-rt in llvm 6, so fixed that too.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)CC @Ralith