aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-10-10 21:07:20 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-10-10 21:07:20 +0000
commitd173d12e77c2ba9c46717353891f817333ce4995 (patch)
treec443871a7a21f0f49e7d8a06553ea05e09d467d4
parent472371b9b0bda52662ed869bad1461a93fa11077 (diff)
downloadglibc-d173d12e77c2ba9c46717353891f817333ce4995.zip
glibc-d173d12e77c2ba9c46717353891f817333ce4995.tar.gz
glibc-d173d12e77c2ba9c46717353891f817333ce4995.tar.bz2
Don't include link-libc-static in +link-static-before-libc.
-rw-r--r--ChangeLog3
-rw-r--r--Makeconfig2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a62434..31662fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-10-10 Joseph Myers <joseph@codesourcery.com>
+ * Makeconfig (+link-static-before-libc): Don't include
+ $(link-static-libc).
+
* libio/libio.h (_IO_pos_t): Remove.
2012-10-10 Alexandre Oliva <aoliva@redhat.com>
diff --git a/Makeconfig b/Makeconfig
index 6a54bf3..f451ec2 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -434,7 +434,7 @@ ifndef +link-static
$(start-installed-name))\
$(+preinit) $(link-extra-libs-static) \
$(common-objpfx)libc% $(+postinit),$^) \
- $(link-extra-libs-static) $(link-libc-static)
+ $(link-extra-libs-static)
+link-static-after-libc = $(+postctorT) $(+postinit)
+link-static = $(+link-static-before-libc) $(link-libc-static) \
$(+link-static-after-libc)