From: Marek Benc <dusxmt@gmx.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: [PATCH 4/4] gnu: gcc: Also substitute the dynamic linker name for GNU, (ie. Hurd) systems.
Date: Thu, 05 Feb 2015 17:32:27 +0100 [thread overview]
Message-ID: <54D39B1B.4060300@gmx.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
In the gcc package, the system-dependent paths to the dynamic linker get
substituted before building, but only for Linux systems. This patch adds
the substitution for GNU systems.
--
Marek.
[-- Attachment #2: git-patch-4.patch --]
[-- Type: text/x-patch, Size: 1346 bytes --]
From 7ae53fd611dd78a8c185734dad268428a8b931a8 Mon Sep 17 00:00:00 2001
From: Marek Benc <dusxmt@gmx.com>
Date: Thu, 5 Feb 2015 17:12:54 +0100
Subject: [PATCH] gnu: gcc: Also substitute the dynamic linker name for GNU
(ie. Hurd) systems.
* gnu/packages/gcc.scm (gcc-4.7): Also substitute the dynamic linker name for GNU (ie. Hurd) systems.
---
gnu/packages/gcc.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 0260158..271d277 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -186,6 +186,13 @@ where the OS part is overloaded to denote a specific ABI---into GCC
suffix
(string-append libc ,(glibc-dynamic-linker)))))
+ (substitute* (find-files "gcc/config"
+ "^gnu(64|-elf)?\\.h$")
+ (("#define GNU_USER_DYNAMIC_LINKER([^ ]*).*$" _ suffix)
+ (format #f "#define GNU_USER_DYNAMIC_LINKER~a \"~a\"~%"
+ suffix
+ (string-append libc ,(glibc-dynamic-linker)))))
+
;; Tell where to find libstdc++, libc, and `?crt*.o', except
;; `crt{begin,end}.o', which come with GCC.
(substitute* (find-files "gcc/config"
--
2.2.1
next reply other threads:[~2015-02-05 16:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-05 16:32 Marek Benc [this message]
2015-02-07 23:22 ` [PATCH 4/4] gnu: gcc: Also substitute the dynamic linker name for GNU, (ie. Hurd) systems Ludovic Courtès
2015-02-09 17:24 ` Marek Benc
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
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=54D39B1B.4060300@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 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).