gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcc: don't apply c++tools --enable-default-pie patch for gcc-16+

Browse Source 
The patch is already applied upstream at https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=3f1f99ef82a65d66e3aaa429bf4fb746b93da0db
and causes conflict when applied on top of current git master as:

    xgcc> applying patch /nix/store/kxfa7n7k3clgw13yafj5irj51gk2w3dg-c++tools-dont-check-enable-default-pie.patch
    xgcc> patching file c++tools/configure
    xgcc> Reversed (or previously applied) patch detected!  Assume -R? [n]
    xgcc> Apply anyway? [n]
    xgcc> Skipping patch.
    xgcc> 3 out of 3 hunks ignored -- saving rejects to file c++tools/configure.rej
    xgcc> patching file c++tools/configure.ac
    xgcc> Reversed (or previously applied) patch detected!  Assume -R? [n]
    xgcc> Apply anyway? [n]
    xgcc> Skipping patch.
    xgcc> 1 out of 1 hunk ignored -- saving rejects to file c++tools/configure.ac.rej
This commit is contained in:
Sergei Trofimovich
2025-12-17 06:27:45 +00:00
parent 12a5e10fa3
commit df4f7ea710
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/patches/default.nix
+1 -1
View File
@@ -99,7 +99,7 @@ optionals noSysDirs (
++ optional (atLeast14 && !canApplyIainsDarwinPatches) ./cfi_startproc-reorder-label-14-1.diff
# c++tools: Don't check --enable-default-pie.
# --enable-default-pie breaks bootstrap gcc otherwise, because libiberty.a is not found
++ optional atLeast14 ./c++tools-dont-check-enable-default-pie.patch
++ optional (is14 || is15) ./c++tools-dont-check-enable-default-pie.patch
## 2. Patches relevant on specific platforms ####################################