From eea421557050758187f717585e26b769f816670f Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 4 May 2009 18:41:08 +0000 Subject: fix the uclibc rebuild issue which leads to unresolved symbols in libnl (and possibly other libraries) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15599 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/gcc/Makefile | 1 + toolchain/uClibc/Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 346971c658..e9598d8177 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -176,6 +176,7 @@ define Stage1/Install # XXX: glibc insists on linking against libgcc_eh ( cd $(TOOLCHAIN_DIR)/usr/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) ; \ [ -e libgcc_eh.a ] || ln -sf libgcc.a libgcc_eh.a ; \ + cp libgcc.a libgcc_initial.a; \ ) endef diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index e8407fb9c5..b55796b40f 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -88,12 +88,13 @@ endef define Host/Configure endef -UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \ +UCLIBC_MAKE = PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ HOSTCC="$(HOSTCC)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ + LIBGCC="$(subst libgcc.a,libgcc_initial.a,$(shell $(TARGET_CC) -print-libgcc-file-name))" \ DOSTRIP="" define Host/Compile -- cgit v1.2.3