diff options
| author | Christian Lütke-Stetzkamp <christian@lkamp.de> | 2020-02-27 16:39:35 +0100 |
|---|---|---|
| committer | Christian Lütke-Stetzkamp <christian@lkamp.de> | 2020-03-06 10:34:57 +0100 |
| commit | 80729b6787df693b0f570e166210f5b5db432463 (patch) | |
| tree | 4b38adf96fb0a899e9d6c7eaf7d37d95706dc4fd /pkgs/build-support/cc-wrapper | |
| parent | 205f42b1422feda79cf8205e87ff0cd786bc042e (diff) | |
| download | nixpkgs-80729b6787df693b0f570e166210f5b5db432463.tar nixpkgs-80729b6787df693b0f570e166210f5b5db432463.tar.gz nixpkgs-80729b6787df693b0f570e166210f5b5db432463.tar.bz2 nixpkgs-80729b6787df693b0f570e166210f5b5db432463.tar.lz nixpkgs-80729b6787df693b0f570e166210f5b5db432463.tar.xz nixpkgs-80729b6787df693b0f570e166210f5b5db432463.tar.zst nixpkgs-80729b6787df693b0f570e166210f5b5db432463.zip | |
stdenv: Fix gcc multi line libc-cflags
which broke at least libstdc++5. Closes #79761
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index b078bf2fbbd..8b218eb590b 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -361,7 +361,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 |