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

stdenv: Fix gcc multi line libc-cflags
This commit is contained in:
John Ericson 2020-03-07 21:28:33 -05:00 committed by GitHub
commit 5c4dd08a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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