diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-12 23:35:44 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-12 23:35:44 +0100 |
commit | e5107f3250800f5194c6fae4050eb3ea7f61209d (patch) | |
tree | 72532917e1b42d6cce8583ab9c2d2786c6dc81c8 | |
parent | 9dd3e61fcc58a31991ce775a7c78383aa4419cee (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-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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 |