diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-12-01 07:33:49 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-12-01 07:33:49 +0100 |
commit | 305cd929fd6c40435a4e46e0850c3c339b84390f (patch) | |
tree | af48b07cbe816861249b134f961a95d593407731 /pkgs/development/compilers/gcc | |
parent | bd3afbb69048c7acb07c9fdced5feaafc85b1175 (diff) | |
parent | c44890cbd0106da23ac34d9d853ae5a162e9e39f (diff) | |
download | nixlib-305cd929fd6c40435a4e46e0850c3c339b84390f.tar nixlib-305cd929fd6c40435a4e46e0850c3c339b84390f.tar.gz nixlib-305cd929fd6c40435a4e46e0850c3c339b84390f.tar.bz2 nixlib-305cd929fd6c40435a4e46e0850c3c339b84390f.tar.lz nixlib-305cd929fd6c40435a4e46e0850c3c339b84390f.tar.xz nixlib-305cd929fd6c40435a4e46e0850c3c339b84390f.tar.zst nixlib-305cd929fd6c40435a4e46e0850c3c339b84390f.zip |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/development/compilers/gcc')
-rw-r--r-- | pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch index d938d67a2d06..4e6c392ce76e 100644 --- a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch +++ b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch @@ -17,10 +17,10 @@ Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver -fmacro-prefix-map=/nix/... -In practice it quickly exhausts argument lengtth limit due to `gcc` +In practice it quickly exhausts argument length limit due to `gcc` deficiency: https://gcc.gnu.org/PR111527 -Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +Until it's fixed let's hardcode header mangling if $NIX_STORE variable is present in the environment. Tested as: diff --git a/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch index 57ae2111f020..ea0673219eb1 100644 --- a/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch +++ b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch @@ -17,10 +17,10 @@ Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver -fmacro-prefix-map=/nix/... -In practice it quickly exhausts argument lengtth limit due to `gcc` +In practice it quickly exhausts argument length limit due to `gcc` deficiency: https://gcc.gnu.org/PR111527 -Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +Until it's fixed let's hardcode header mangling if $NIX_STORE variable is present in the environment. Tested as: |