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

ccacheStdenv: prefer default extraConfig from ccacheWrapper #108594

Closed
wants to merge 1 commit into from

Conversation

kira-bruneau
Copy link
Contributor

@kira-bruneau kira-bruneau commented Jan 6, 2021

Motivation for this change

This commit brings back the original behaviour before commit 82ca111 where ccacheStdenv would use the extraConfig from ccacheWrapper when ccacheWrapper was overridden.

See #104425 (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.

@r-burns @ElXreno

@kira-bruneau kira-bruneau changed the title ccacheStdenv: prefer default extraConfig from ccacheWrapper ccacheStdenv: prefer defaults from ccacheWrapper Jan 7, 2021
@kira-bruneau kira-bruneau changed the title ccacheStdenv: prefer defaults from ccacheWrapper ccacheStdenv: prefer default extraConfig from ccacheWrapper Jan 7, 2021
@r-burns
Copy link
Contributor

r-burns commented Mar 28, 2021

4.2.1 test.multi_arch fails on darwin, with:

/tmp/nix-build-ccache-4.2.1.drv-0/source/test/run: line 342: compgen: command not found
Running test suite multi_arch/tmp/nix-build-ccache-4.2.1.drv-0/source/test/run: line 342: compgen: command not found
.
FAILED

Test suite:     multi_arch (line 20)
Test case:      cache hit, direct mode
Failure reason: Expected "cache miss" to be 1, actual 0

@kira-bruneau
Copy link
Contributor Author

kira-bruneau commented Mar 30, 2021

Oh sorry @r-burns, I didn't mean to update this PR. I pushed to my ccache branch to try out the build in a Mac VM. I'll try to see if I can fix this failure without disabling the test.

@kira-bruneau
Copy link
Contributor Author

I keep accidentally pushing to this PR on each ccache update, so I will include this fix in the next update.

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

3 participants