fix glibc build on CygWin

toolchain/glibc/Makefile

@@ -10,20 +10,19 @@ include ${TOPDIR}/mk/buildhlp.mk
 # glibc does not compile with Os
 TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS))
 
-GLIBC_CONFOPTS:=          \
+GLIBC_CONFOPTS:=        \
 			--build=$(GNU_HOST_NAME) \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \
 			--disable-nls \
 			--disable-sanity-checks \
-			--disable-nls \
 			--without-cvs \
 			--disable-profile \
 			--disable-debug \
+			--enable-kernel="2.6.0" \
 			--without-gd \
 			--with-__thread \
 			--with-tls \
-			--enable-kernel="2.6.0" \
 			--enable-add-ons
 
 GLIBC_ENV:=		PATH='${TARGET_PATH}' \
@@ -33,7 +32,6 @@ GLIBC_ENV:=		PATH='${TARGET_PATH}' \
 			CXX=${REAL_GNU_TARGET_NAME}-g++ \
 			AR=${REAL_GNU_TARGET_NAME}-ar \
 			RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \
-			LD=${REAL_GNU_TARGET_NAME}-ld \
 			libc_cv_forced_unwind=yes \
 			libc_cv_c_cleanup=yes \
 			libc_cv_gnu99_inline=yes \
@@ -51,19 +49,20 @@ GLIBC_BUILD_DIR_INITIAL:=	${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-headers
 GLIBC_BUILD_DIR_FINAL:=		${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)-final
 
 $(WRKBUILD)/.headers_configure:
-	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); ln -sf ../glibc-ports-2.11/ ports);
 	mkdir -p $(GLIBC_BUILD_DIR_INITIAL)
+	(cd ${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION); ln -sf ../glibc-ports-2.11/ ports);
 	(cd $(GLIBC_BUILD_DIR_INITIAL); \
+		${GLIBC_ENV} \
 		$(WRKBUILD)/configure \
-		--prefix=/usr \
-		--with-sysroot=$(TOOLCHAIN_SYSROOT) \
-		${GLIBC_CONFOPTS} \
+			--prefix=/usr \
+			--with-sysroot=$(TOOLCHAIN_SYSROOT) \
+			${GLIBC_CONFOPTS} \
 	);
 	touch $@
 
 $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 	mkdir -p $(TOOLCHAIN_SYSROOT)/usr/lib
-	-$(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_INITIAL) \
+	-${GLIBC_ENV} $(MAKE) ${GLIBC_MAKEOPTS} -C $(GLIBC_BUILD_DIR_INITIAL) \
 		cross-compiling=yes \
 		install_root=$(TOOLCHAIN_SYSROOT) \
 		install-headers