Просмотр исходного кода

fix the uclibc rebuild issue which leads to unresolved symbols in libnl (and possibly other libraries)

SVN-Revision: 15599
Felix Fietkau 16 лет назад
Родитель
Сommit
141925202e
2 измененных файлов с 3 добавлено и 1 удалено
  1. 1 0
      toolchain/gcc/Makefile
  2. 2 1
      toolchain/uClibc/Makefile

+ 1 - 0
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
 

+ 2 - 1
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