summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-02-12 23:35:44 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-02-12 23:35:44 +0100
commite5107f3250800f5194c6fae4050eb3ea7f61209d (patch)
tree72532917e1b42d6cce8583ab9c2d2786c6dc81c8
parent9dd3e61fcc58a31991ce775a7c78383aa4419cee (diff)
Update to recent glibc
* Makefile [IN_GLIBC] (CPPFLAGS): Do not add -imacros libc-symbols.h. ($(objpfx)libpthread.so): Replace elfobjdir with elf-objpfx.
-rw-r--r--Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 2f45c1c..b8dee58 100644
--- a/Makefile
+++ b/Makefile
@@ -235,9 +235,6 @@ CPPFLAGS += \
ifeq ($(IN_GLIBC),no)
CPPFLAGS += \
-imacros $(srcdir)/include/libc-symbols.h
-else
-CPPFLAGS += \
- -imacros libc-symbols.h
endif
ifeq ($(IN_GLIBC),yes)
@@ -291,7 +288,7 @@ include ../Rules
# a statically-linked program that hasn't already loaded it.
# Depend on ld.so too to get proper versions of ld.so symbols.
$(objpfx)libpthread.so: $(libc-link.so) $(common-objpfx)libc_nonshared.a \
- $(if $(filter yes,$(elf)), $(elfobjdir)/ld.so) \
+ $(if $(filter yes,$(elf)), $(elf-objpfx)/ld.so) \
$(common-objpfx)/mach/libmachuser.so \
$(common-objpfx)/hurd/libhurduser.so
endif