diff options
| author | Josselin Poiret <dev@jpoiret.xyz> | 2024-02-01 14:35:16 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:51 +0200 |
| commit | 390867226182a685f476b7bd1c856674fdcfd51c (patch) | |
| tree | 2d081bd1082f491cb2290b4a30b3dd2db56fed0b /gnu | |
| parent | 70b2015ec5356cd6c8fd6532750db9cd01f66967 (diff) | |
| download | guix-390867226182a685f476b7bd1c856674fdcfd51c.tar.gz guix-390867226182a685f476b7bd1c856674fdcfd51c.zip | |
gnu: gcc: Simplify application of Hurd-specific pthread patch.
* gnu/packages/gcc.scm (gcc-11): Apply gcc-11-libstdc++-hurd-libpthread.patch
unconditionally.
(gcc-12): Also apply gcc-11-libstdc++-hurd-libpthread.patch.
Change-Id: I80e2b2adb5636e1bff4536c5a0a348955454e81d
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gcc.scm | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index e6602d2193..4350407d63 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -741,21 +741,10 @@ It also includes runtime support libraries for these languages.") (base32 "1ncd7akww0hl5kkmw1dj3qgqp3phdrr5dfnm7jia9s07n0ib4b9z")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" - "gcc-5.0-libvtv-runpath.patch")) + "gcc-5.0-libvtv-runpath.patch" + "gcc-11-libstdc++-hurd-libpthread.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) - (arguments - (substitute-keyword-arguments (package-arguments gcc-8) - ((#:phases phases #~%standard-phases) - (if (target-hurd?) - #~(modify-phases #$phases - (add-after 'unpack 'patch-hurd-libpthread - (lambda _ - (define patch - #$(local-file - (search-patch "gcc-11-libstdc++-hurd-libpthread.patch"))) - (invoke "patch" "--force" "-p1" "-i" patch)))) - phases)))) (properties `((compiler-cpu-architectures ("aarch64" ,@%gcc-11-aarch64-micro-architectures) @@ -777,7 +766,8 @@ It also includes runtime support libraries for these languages.") (base32 "0xcida8l2wykvvzvpcrcn649gj0ijn64gwxbplacpg6c0hk6akvh")) (patches (search-patches "gcc-12-strmov-store-file-names.patch" - "gcc-5.0-libvtv-runpath.patch")) + "gcc-5.0-libvtv-runpath.patch" + "gcc-11-libstdc++-hurd-libpthread.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (properties |