Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fd48d9b119ef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5c4dd08a03d9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 6, 2020

  1. stdenv: Fix gcc multi line libc-cflags 

    which broke at least libstdc++5.

Closes #79761
    @clkamp
    clkamp committed Mar 6, 2020
    Copy the full SHA
    80729b6 View commit details

Commits on Mar 8, 2020

  1. Merge pull request #81191 from clkamp/stdenv-multi-line-libc-cflags 

    stdenv: Fix gcc multi line libc-cflags
    @Ericson2314
    Ericson2314 authored Mar 8, 2020
    Copy the full SHA
    5c4dd08 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/build-support/cc-wrapper/default.nix
4 changes: 4 additions & 0 deletions pkgs/build-support/cc-wrapper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -363,7 +363,11 @@ stdenv.mkDerivation {
done
''

# There are a few tools (to name one libstdcxx5) which do not work
# well with multi line flags, so make the flags single line again
+ ''
substituteInPlace $out/nix-support/libc-cflags --replace $'\n' ' '
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash