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

stdenv: Fix gcc multi line libc-cflags #81191

Merged
merged 1 commit into from Mar 8, 2020

Conversation

clkamp
Copy link
Contributor

@clkamp clkamp commented Feb 27, 2020

Motivation for this change

Multiple lines in libc-cflags were introduced in 162a935

Closes #79761

Things done

I tested only the cc-wrapper because of the large number of recompiles. But I have checked, that this realy fixes #79761 by applying the concatenation to the reading cat'ing of libc-cflags in there.

  • 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.

@veprbl
Copy link
Member

veprbl commented Feb 27, 2020

Instead of processing the file with tr we could instead replace "echo" with "echo -n"

@vcunat
Copy link
Member

vcunat commented Feb 27, 2020

Either seems OK to me and very unlikely to break anything. I can confirm this PR fixes the broken libstdcxx5 build.

pkgs/build-support/cc-wrapper/default.nix Outdated Show resolved Hide resolved
@clkamp clkamp force-pushed the stdenv-multi-line-libc-cflags branch from 202175c to bc57a4d Compare March 4, 2020 12:31
which broke at least libstdc++5.

Closes NixOS#79761
@clkamp clkamp force-pushed the stdenv-multi-line-libc-cflags branch from bc57a4d to 80729b6 Compare March 6, 2020 09:35
@clkamp clkamp requested a review from Ericson2314 March 6, 2020 09:36
@Ericson2314 Ericson2314 merged commit 5c4dd08 into NixOS:staging Mar 8, 2020
Staging automation moved this from WIP to Done Mar 8, 2020
vcunat added a commit that referenced this pull request Mar 10, 2020
Regression introduced in PR #81191 80729b6.  The file does not exist
somewhere during bootstrap of pkgsStatic.busybox which is used in nix
(by default).

I tested the builds.
rvem pushed a commit to serokell/nixpkgs that referenced this pull request Nov 8, 2022
Regression introduced in PR NixOS#81191 80729b6.  The file does not exist
somewhere during bootstrap of pkgsStatic.busybox which is used in nix
(by default).

I tested the builds.
rvem pushed a commit to serokell/nixpkgs that referenced this pull request Nov 8, 2022
Regression introduced in PR NixOS#81191 80729b6.  The file does not exist
somewhere during bootstrap of pkgsStatic.busybox which is used in nix
(by default).

I tested the builds.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

5 participants