From: Marek Benc <dusxmt@gmx.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH 4/4] gnu: gcc: Also substitute the dynamic linker name for GNU, (ie. Hurd) systems.
Date: Mon, 09 Feb 2015 18:24:27 +0100 [thread overview]
Message-ID: <54D8ED4B.8080109@gmx.com> (raw)
In-Reply-To: <87r3u1wbmj.fsf@gnu.org>
On 02/08/2015 12:22 AM, Ludovic Courtès wrote:
>
> Would this slightly more concise approach work:
>
>
>
> diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
> index 6143f5b..5cb7f8b 100644
> --- a/gnu/packages/gcc.scm
> +++ b/gnu/packages/gcc.scm
> @@ -202,10 +202,11 @@ where the OS part is overloaded to denote a specific ABI---into GCC
>
> ;; Fix the dynamic linker's file name.
> (substitute* (find-files "gcc/config"
> - "^linux(64|-elf|-eabi)?\\.h$")
> - (("#define GLIBC_DYNAMIC_LINKER([^ ]*).*$" _ suffix)
> - (format #f "#define GLIBC_DYNAMIC_LINKER~a \"~a\"~%"
> - suffix
> + "^(gnu|linux)(64|-elf|-eabi)?\\.h$")
> + (("#define (GLIBC|GNU_USER)_DYNAMIC_LINKER([^ ]*).*$" _
> + kind suffix)
> + (format #f "#define ~a_DYNAMIC_LINKER~a \"~a\"~%"
> + kind suffix
> (string-append libc ,(glibc-dynamic-linker)))))
>
> ;; Tell where to find libstdc++, libc, and `?crt*.o', except
>
>
Most probably yes, but the previous part of the code (which joins the
lines defining a dynamic linker) will also need to be modified to take
GNU_USER_DYNAMIC_LINKER into account, as the code also substitutes some
entries in the linux.h files, which are usually multiline (most of the
time, a CHOOSE_DYNAMIC_LINKER macro)...
Sorry, I'm way too weak of a schemer to do that, even though it's
probably incredibly simple...
>
>
> Thanks,
> Ludo’.
>
--
Marek.
next prev parent reply other threads:[~2015-02-09 17:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-05 16:32 [PATCH 4/4] gnu: gcc: Also substitute the dynamic linker name for GNU, (ie. Hurd) systems Marek Benc
2015-02-07 23:22 ` Ludovic Courtès
2015-02-09 17:24 ` Marek Benc [this message]
2015-02-10 16:27 ` Ludovic Courtès
2015-03-10 8:40 ` Manolis Ragkousis
2015-03-10 12:43 ` Ludovic Courtès
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54D8ED4B.8080109@gmx.com \
--to=dusxmt@gmx.com \
--cc=guix-devel@gnu.org \
--cc=ludo@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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.