OSDN Git Service

Rules.mak: add ldso search paths independently of NPTL
authorPeter S. Mazinger <ps.m@gmx.net>
Wed, 30 Mar 2011 20:20:27 +0000 (22:20 +0200)
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Fri, 15 Jun 2012 12:00:34 +0000 (14:00 +0200)
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Rules.mak

index 70306f3..fc2df69 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -632,7 +632,9 @@ CFLAGS := $(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \
        -nostdinc -I$(top_builddir)include \
        -I$(top_srcdir)include -include libc-symbols.h \
        -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) \
-       -I$(top_srcdir)libc/sysdeps/linux -I.
+       -I$(top_srcdir)libc/sysdeps/linux \
+       -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \
+       -I$(top_srcdir)ldso/include -I.
 ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"")
 CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS))
 endif
@@ -733,9 +735,7 @@ PTINC:= -I$(top_builddir)$(PTDIR)                                   \
        -I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux                 \
        -I$(top_srcdir)$(PTDIR)/sysdeps/pthread                         \
        -I$(top_srcdir)$(PTDIR)/sysdeps/pthread/bits                    \
-       -I$(top_srcdir)$(PTDIR)/sysdeps/generic                         \
-       -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH)                         \
-       -I$(top_srcdir)ldso/include
+       -I$(top_srcdir)$(PTDIR)/sysdeps/generic
 #
 # Test for TLS if NPTL support was selected.
 #