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

llvm{6..10}/compiler-rt: fix compilation on Darwin #87528

Merged
merged 1 commit into from May 20, 2020

Conversation

@ggreif
Copy link
Contributor

ggreif commented May 10, 2020

Motivation for this change

The patch #85945 seems to have broken things. Correcting the fallout.

See #85945 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.
@ggreif
Copy link
Contributor Author

ggreif commented May 10, 2020

@GrahamcOfBorg build llvmPackages_6.compiler-rt llvmPackages_7.compiler-rt llvmPackages_8.compiler-rt llvmPackages_9.compiler-rt llvmPackages_10.compiler-rt

@ggreif ggreif marked this pull request as ready for review May 10, 2020
@ggreif ggreif requested a review from matthewbauer as a code owner May 10, 2020
@doronbehar doronbehar mentioned this pull request May 10, 2020
3 of 10 tasks complete
@ggreif ggreif changed the title compiler-rt{6..10}: fix compilation on Darwin llvm/compiler-rt{6..10}: fix compilation on Darwin May 10, 2020
@ggreif ggreif changed the title llvm/compiler-rt{6..10}: fix compilation on Darwin llvm{6..10}/compiler-rt: fix compilation on Darwin May 10, 2020
@matthewbauer matthewbauer changed the base branch from master to staging May 11, 2020
@matthewbauer matthewbauer changed the base branch from staging to master May 11, 2020
@ggreif ggreif mentioned this pull request May 20, 2020
3 of 10 tasks complete
@DieGoldeneEnte
Copy link
Contributor

DieGoldeneEnte commented May 20, 2020

This should be merged into staging not master :)

@ggreif ggreif changed the base branch from master to staging May 20, 2020
@DieGoldeneEnte
Copy link
Contributor

DieGoldeneEnte commented May 20, 2020

ofborg labels this as 5001+ packages for darwin need to be rebuild (basically everything c/c++ I think).

@ggreif
Copy link
Contributor Author

ggreif commented May 20, 2020

Certainly, my mind was on another PR :-)

@ggreif
Copy link
Contributor Author

ggreif commented May 20, 2020

@matthewbauer What is blocking the merge of this guy?

@matthewbauer
Copy link
Member

matthewbauer commented May 20, 2020

Any idea why the checks are failing? It doesn’t look related to the PR so may be a staging issue.

@ggreif
Copy link
Contributor Author

ggreif commented May 20, 2020

@GrahamcOfBorg build llvmPackages_6.compiler-rt llvmPackages_7.compiler-rt llvmPackages_8.compiler-rt llvmPackages_9.compiler-rt llvmPackages_10.compiler-rt

@ggreif
Copy link
Contributor Author

ggreif commented May 20, 2020

@matthewbauer the error is

autoreconf: running: /nix/store/k8nj00yrqlcf7wy2gj5ybz6nk7ki4ylv-autoconf-2.69/bin/autoconf --force
configure.ac:136: error: possibly undefined macro: AC_MSG_FAILURE
      If this token and others are legitimate, please use m4_pattern_allow.
      See the Autoconf documentation.
configure.ac:310: error: possibly undefined macro: AC_CHECK_LIB
autoreconf: /nix/store/k8nj00yrqlcf7wy2gj5ybz6nk7ki4ylv-autoconf-2.69/bin/autoconf failed with exit status: 1
builder for '/nix/store/k1wkxxar19dgqwna2pl0ra9rd047mijh-libarchive-3.4.2.drv' failed with exit code 1

which I have never seen before. Seems unrelated, but scary nevertheless.

addendum to #85945
@ggreif ggreif force-pushed the ggreif:ggreif/compiler-rt branch from 010e8b8 to d54bfa2 May 20, 2020
@matthewbauer matthewbauer merged commit bbf0790 into NixOS:staging May 20, 2020
2 of 4 checks passed
2 of 4 checks passed
grahamcofborg-eval Complete, with errors
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ggreif ggreif deleted the ggreif:ggreif/compiler-rt branch May 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.