浏览代码

Don't pass --with-build-sysroot with NATIVE build

This is not needed since we already have a native musl toolchain at our
disposal. Previously, since this flag was passed for NATIVE=1, the build would
fail because the build sysroot is only built for cross toolchains.
Michael Forney 8 年之前
父节点
当前提交
97173cd74f
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      litecross/Makefile

+ 1 - 1
litecross/Makefile

@@ -52,7 +52,6 @@ FULL_TOOLCHAIN_CONFIG = --enable-languages=c,c++ \
 	--target=$(TARGET) --prefix= \
 	--target=$(TARGET) --prefix= \
 	--libdir=/lib --disable-multilib \
 	--libdir=/lib --disable-multilib \
 	--with-sysroot=$(SYSROOT) \
 	--with-sysroot=$(SYSROOT) \
-	--with-build-sysroot=$(CURDIR)/obj_sysroot \
 	--enable-tls \
 	--enable-tls \
 	--disable-libmudflap --disable-libsanitizer \
 	--disable-libmudflap --disable-libsanitizer \
 	--disable-gnu-indirect-function \
 	--disable-gnu-indirect-function \
@@ -64,6 +63,7 @@ FULL_MUSL_CONFIG = $(MUSL_CONFIG) \
 
 
 ifeq ($(NATIVE),)
 ifeq ($(NATIVE),)
 SYSROOT = /$(TARGET)
 SYSROOT = /$(TARGET)
+FULL_TOOLCHAIN_CONFIG += --with-build-sysroot=$(CURDIR)/obj_sysroot
 FULL_MUSL_CONFIG += CC="$(XGCC)" LIBCC="../obj_toolchain/$(TARGET)/libgcc/libgcc.a" 
 FULL_MUSL_CONFIG += CC="$(XGCC)" LIBCC="../obj_toolchain/$(TARGET)/libgcc/libgcc.a" 
 MUSL_VARS = AR=../obj_toolchain/binutils/ar RANLIB=../obj_toolchain/binutils/ranlib
 MUSL_VARS = AR=../obj_toolchain/binutils/ar RANLIB=../obj_toolchain/binutils/ranlib
 obj_musl/.lc_built: | obj_toolchain/$(TARGET)/libgcc/libgcc.a
 obj_musl/.lc_built: | obj_toolchain/$(TARGET)/libgcc/libgcc.a