1 files changed, 3 insertions, 13 deletions
diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index 98de4c9d5..aa126b9d1 100644
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -10,7 +10,7 @@ CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS) -D_GNU_SOURCE
 # This stuff will not work with -fomit-frame-pointer
 CFLAGS-ldso += -fno-omit-frame-pointer
 
-CFLAGS-ldso += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_builddir)ldso/ldso
+CFLAGS-ldso += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_srcdir)ldso/ldso
 CFLAGS-ldso += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\"
 
 ifeq ($(SUPPORT_LD_DEBUG),y)
@@ -30,6 +30,8 @@ endif
 
 CFLAGS-ldso/ldso/$(TARGET_ARCH)/ := $(CFLAGS-ldso)
 
+CFLAGS-ldso.c := -DLDSO_ELFINTERP=\"$(TARGET_ARCH)/elfinterp.c\"
+
 ifneq ($(SUPPORT_LD_DEBUG),y)
 LDFLAGS-ld-uClibc.so := $(LDFLAGS)
 else
@@ -52,13 +54,9 @@ ld-uClibc_OBJS := $(ld-uClibc_COBJ) $(ld-uClibc_SOBJ)
 
 ld-uClibc-so-y := $(ld-uClibc_OBJS:.o=.os)
 
-HEADERS         := $(top_builddir)ldso/ldso/dl-progname.h
-
 #lib-so-y := $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO))
 ld-uClibc-y := $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO))
 objclean-y += ld-uClibc_clean
-headers-$(HAVE_SHARED) += ldso_headers
-headers_clean-y += ldso_headers_clean
 
 $(top_builddir)lib/$(patsubst %.$(MAJOR_VERSION),%,$(UCLIBC_LDSO)): $(ld-uClibc_OUT)/ld-uClibc_so.a $(top_builddir)include/headers_done
 	$(call link.so,$(ldso_FULL_NAME),$(MAJOR_VERSION))
@@ -68,13 +66,5 @@ $(ld-uClibc_OUT)/ld-uClibc_so.a: $(ld-uClibc-so-y)
 	$(do_strip)
 	$(do_ar)
 
-ldso_headers: $(HEADERS)
-
-$(top_builddir)ldso/ldso/dl-progname.h:
-	echo '#include "$(TARGET_ARCH)/elfinterp.c"' > $@
-
-ldso_headers_clean:
-	$(RM) $(HEADERS)
-
 ld-uClibc_clean:
 	$(RM) $(ld-uClibc_OUT)/*.{o,os,a} $(ld-uClibc_OUT)/*/*.{o,os}