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.

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

libcxxabi: don't depend on libunwind #70321

Merged
merged 1 commit into from Oct 4, 2019

Conversation

nmattia
Copy link
Contributor

@nmattia nmattia commented Oct 3, 2019

Motivation for this change

libcxxabi doesn't need libunwind

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

nix-review fails on idros-icommands on Linux but that fails on master as well. Otherwise all green.

Notify maintainers

cc @dtzWill @basvandijk

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

nix-review passes on NixOS (1 broken on master)
diff LGTM
executables still seem to work across most of the packages

[26 built (1 failed), 83 copied (1550.3 MiB), 492.3 MiB DL]
error: build of '/nix/store/8373j21hf419f6xbjwyxb0v73yhzk9ji-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/70321
6 package are marked as broken and were skipped:
clang-sierraHack clang-sierraHack-stdenv darwin.binutils darwin.binutils-unwrapped darwin.cctools darwin.maloader

1 package failed to build:
irods-icommands

16 package were build:
cquery discord discord-canary discord-ptb gitter irods jucipp libcxx libcxxStdenv libcxxabi llvmPackages.libcxxClang python27Packages.pybindgen python27Packages.pygccxml python37Packages.pygccxml sbt-with-scala-native teamspeak_client

@jonringer
Copy link
Contributor

no change in closure size, so probably wasn't being used

[nix-shell:~/.cache/nix-review/pr-70321]$ nix path-info -Sh ./results/libcxxabi
/nix/store/8pyhq0s845k3bwhwk27n3r3qr4cphal1-libc++abi-7.1.0       27.6M
[16:34:53] jon@jon-workstation ~/projects/nixpkgs (master)
$ nix path-info -Sh ./result
/nix/store/83rjaci4x5g173d69q4h78qmvrv9lz15-libc++abi-7.1.0       27.6M

@jonringer
Copy link
Contributor

@GrahamcOfBorg build libcxxabi

@nmattia
Copy link
Contributor Author

nmattia commented Oct 4, 2019

Right, and regarding the one failure of nix-review:

nix-review fails on idros-icommands on Linux but that fails on master as well. Otherwise all green.

Let's merge!

@basvandijk basvandijk merged commit 761df21 into NixOS:master Oct 4, 2019
@nmattia nmattia deleted the nm-no-unwind-for-cxxabi branch October 4, 2019 08:21
@dtzWill
Copy link
Member

dtzWill commented Oct 4, 2019 via email

@nmattia
Copy link
Contributor Author

nmattia commented Oct 4, 2019

@dtzWill feel free to revert. I fixed libunwind when trying to fix the static builds for libcxx and libcxxabi which depend on it; when I figured out neither actually needed libunwind I decided to save someone else's time who might try to fix libunwind first.

In the end I'm not using any of these and use llvm's libunwind directly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants