X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2Feglibc%2FMakefile;h=d237f4e123a69a07e62669f6fb76352f4c499e5c;hb=724307fca164fcb896915a0d05e0d3e1e7f890b8;hp=4eabbbfe6c6dd5d5d61d4ddafdcf3271b8cf6749;hpb=7eb15898755be46e94078faffdacd8c9b0ce66cd;p=openwrt%2F.git

diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 4eabbbfe6c..d237f4e123 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -33,16 +33,12 @@ endif
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
 
-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_SUBDIR)
+HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR)
 
-override CONFIG_AUTOREBUILD=
+include $(INCLUDE_DIR)/toolchain-build.mk
 
-include $(INCLUDE_DIR)/host-build.mk
-
-STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.eglibc_built
-STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed
+HOST_STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.eglibc_built
+HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed
 
 HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial
 HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final
@@ -55,6 +51,7 @@ EGLIBC_CONFIGURE:= \
 	BUILD_CC="$(HOSTCC)" \
 	$(TARGET_CONFIGURE_OPTS) \
 	CFLAGS="$(EGLIBC_CFLAGS)" \
+	libc_cv_slibdir="/lib" \
 	$(HOST_BUILD_DIR)/libc/configure \
 		--prefix=/usr \
 		--build=$(GNU_HOST_NAME) \
@@ -81,7 +78,7 @@ define Host/SetToolchainInfo
 	$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
 	$(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.eglibc.org/,' $(TOOLCHAIN_DIR)/info.mk
 	$(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
-	$(SED) 's,^\(LIBC_PATCHVER\)=.*,\1=$(PKG_EXTRAVERSION),' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
 endef
 
 define Stage1/Configure