summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-10-08 01:35:55 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-10-08 01:35:55 +0200
commit5ef2b506a97854c20bb4e6403325f25c83082d2b (patch)
treec8401b99acc20ce96da1bbc19e761b0363d8ebbf
parent58695b88a9deaecbcf7794760cc333177edaa2b4 (diff)
Add -lmachuser -lhurduser to libc.so on GNU/Hurd.
http://lists.gnu.org/archive/html/bug-hurd/2011-03/msg00112.html 2011-03-29 Samuel Thibault <samuel.thibault@ens-lyon.org> * Makerules ($(inst_libdir)/libc.so): Add -lmachuser -lhurduser to libc.so on GNU/Hurd. It's still unclear what we want to aim for.
-rw-r--r--.topdeps2
-rw-r--r--.topmsg19
-rw-r--r--Makerules3
3 files changed, 11 insertions, 13 deletions
diff --git a/.topdeps b/.topdeps
index df7c3c6e56..180b47c18b 100644
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1 @@
-9a869d822025be8e43b78234997b10bf0cf9d859
+baseline
diff --git a/.topmsg b/.topmsg
index dd6634c886..dad42e9cba 100644
--- a/.topmsg
+++ b/.topmsg
@@ -1,16 +1,11 @@
-Subject: Baseline for our topic branches.
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Subject: [PATCH] Add -lmachuser -lhurduser to libc.so on GNU/Hurd.
----
+http://lists.gnu.org/archive/html/bug-hurd/2011-03/msg00112.html
-This need not strictly be a TopGit branch, but it is for easy synchronization
-between different machines.
+2011-03-29 Samuel Thibault <samuel.thibault@ens-lyon.org>
-As the baseline is merged into the topic branches, it is forward-only.
+ * Makerules ($(inst_libdir)/libc.so): Add -lmachuser -lhurduser to
+ libc.so on GNU/Hurd.
-To advance it:
-
- $ echo [SHA1] > .topdeps
- $ git commit -m Advance. -- .topdeps
- $ tg update
-
----
+It's still unclear what we want to aim for.
diff --git a/Makerules b/Makerules
index b46b09b369..1f4ca8ab7c 100644
--- a/Makerules
+++ b/Makerules
@@ -962,6 +962,9 @@ $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
'$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \
) > $@.new
+ifeq ($(patsubst gnu%,,$(config-os)),)
+ echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' >> $@.new
+endif
mv -f $@.new $@
endif