浏览代码

fix cross-compile of gcc, when using uClibc. --dynamic-linker was using /lib/ld-uClibc.so.0

Waldemar Brodkorb 10 年之前
父节点
当前提交
82c6a87837
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 0 2
      package/gcc/Makefile
  2. 2 0
      toolchain/gcc/Makefile

+ 0 - 2
package/gcc/Makefile

@@ -14,8 +14,6 @@ PKG_BUILDDEP:=		libmpc gmp mpfr
 PKG_SUBPKGS:=		GCC GXX
 PKGSD_GXX:=		GNU C++ compiler
 
-PKG_LIBC_DEPENDS:=	glibc musl
-
 WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
 
 include ${TOPDIR}/mk/package.mk

+ 2 - 0
toolchain/gcc/Makefile

@@ -18,6 +18,7 @@ GCC_CONFOPTS=		--prefix=$(STAGING_HOST_DIR) \
 			--with-libelf=$(STAGING_HOST_DIR) \
 			--disable-__cxa_atexit \
 			--with-gnu-ld \
+			--with-gnu-as \
 			--disable-libsanitizer \
 			--disable-libitm \
 			--disable-libmudflap \
@@ -176,6 +177,7 @@ $(GCC_BUILD_DIR_FINAL)/.configured:
 		$(WRKBUILD)/configure \
 			${GCC_CONFOPTS} \
 			--enable-languages=$(LANGUAGES) \
+			--with-build-sysroot='$${prefix}/${STAGING_HOST2TARGET}' \
 			--with-sysroot='$${prefix}/${STAGING_HOST2TARGET}' \
 			--enable-shared
 	touch $@