From: Christopher Baines <mail@cbaines.net>
To: 63416@debbugs.gnu.org
Subject: [bug#63416] [PATCH v2 1/2] gnu: gcc: Change custom-gcc to use gexp's.
Date: Thu, 11 May 2023 15:54:09 +0100 [thread overview]
Message-ID: <0c9c655159c65003e63d7ddc9f69a87608ae7ccd.1683816850.git.mail@cbaines.net> (raw)
In-Reply-To: <87o7ms1if5.fsf@cbaines.net>
As this seems to be generating broken derivations for i586-gnu otherwise.
* gnu/packages/gcc.scm (custom-gcc): Use gexp's for the generated package
arguments.
---
gnu/packages/gcc.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 47fb443155..1db37529f7 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1043,18 +1043,18 @@ (define* (custom-gcc gcc name languages
(srfi srfi-26)
(ice-9 regex)))
((#:configure-flags flags)
- `(cons (string-append "--enable-languages="
- ,(string-join languages ","))
- (remove (cut string-match "--enable-languages.*" <>)
- ,flags)))
+ #~(cons (string-append "--enable-languages="
+ #$(string-join languages ","))
+ (remove (cut string-match "--enable-languages.*" <>)
+ #$flags)))
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'install 'remove-broken-or-conflicting-files
- (lambda* (#:key outputs #:allow-other-keys)
- (for-each
- delete-file
- (find-files (string-append (assoc-ref outputs "out") "/bin")
- ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|lto)(-.*)?$"))))))))))
+ #~(modify-phases #$phases
+ (add-after 'install 'remove-broken-or-conflicting-files
+ (lambda* (#:key outputs #:allow-other-keys)
+ (for-each
+ delete-file
+ (find-files (string-append (assoc-ref outputs "out") "/bin")
+ ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|lto)(-.*)?$"))))))))))
(define %generic-search-paths
;; This is the language-neutral search path for GCC. Entries in $CPATH are
base-commit: 4557c83a7d9df6edc9dd3b7b2a53e1a0ec3e6e34
--
2.39.1
next prev parent reply other threads:[~2023-05-11 14:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-10 12:26 [bug#63416] [PATCH 0/2] Fix more derivation builder gexp issues Christopher Baines
2023-05-10 12:28 ` [bug#63416] [PATCH 1/2] gnu: gcc: Change custom-gcc to use gexp's Christopher Baines
2023-05-10 12:28 ` [bug#63416] [PATCH 2/2] gnu: gcc: Change make-gccgo " Christopher Baines
2023-05-11 10:44 ` [bug#63416] [PATCH 0/2] Fix more derivation builder gexp issues Ludovic Courtès
2023-05-11 14:57 ` Christopher Baines
2023-05-15 8:51 ` bug#63416: " Christopher Baines
2023-05-11 14:54 ` Christopher Baines [this message]
2023-05-11 14:54 ` [bug#63416] [PATCH v2 2/2] gnu: gcc: Change make-gccgo to use gexp's Christopher Baines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0c9c655159c65003e63d7ddc9f69a87608ae7ccd.1683816850.git.mail@cbaines.net \
--to=mail@cbaines.net \
--cc=63416@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).