From 829d4e32fe394513e82af3e1b0cddfd5f78fad77 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Tue, 19 Jul 2016 19:43:08 +0000 Subject: [PATCH] remove the LC_ROOT hack from build sysroot LC_ROOT does not seem to have any useful effect, but the build sysroot is passed to shell scripts without expanding the LC_ROOT make variable which breaks tests. --- litecross/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/litecross/Makefile b/litecross/Makefile index 56c57b9..d3c065a 100644 --- a/litecross/Makefile +++ b/litecross/Makefile @@ -51,7 +51,7 @@ FULL_TOOLCHAIN_CONFIG = --enable-languages=c,c++ \ --target=$(TARGET) --prefix= \ --libdir=/lib --disable-multilib \ --with-sysroot=$(SYSROOT) \ - --with-build-sysroot='$$(LC_ROOT)/obj_sysroot' \ + --with-build-sysroot=$(PWD)/obj_sysroot \ --enable-tls \ --disable-libmudflap --disable-libsanitizer \ --disable-gnu-indirect-function \ @@ -154,7 +154,7 @@ obj_toolchain/.lc_configured: | obj_toolchain src_toolchain touch $@ obj_toolchain/gcc/.lc_built: | obj_toolchain/.lc_configured obj_sysroot/usr obj_sysroot/lib64 obj_sysroot/include - cd obj_toolchain && $(MAKE) MAKE="$(MAKE)" LC_ROOT=$(PWD) all-gcc + cd obj_toolchain && $(MAKE) MAKE="$(MAKE)" all-gcc touch $@ obj_musl/.lc_configured: | obj_toolchain/gcc/.lc_built obj_musl src_musl @@ -166,11 +166,11 @@ obj_sysroot/.lc_headers: | obj_musl/.lc_configured obj_sysroot touch $@ obj_toolchain/$(TARGET)/libgcc/.lc_configured: | obj_sysroot/.lc_headers - cd obj_toolchain && $(MAKE) MAKE="$(MAKE)" LC_ROOT=$(PWD) configure-target-libgcc + cd obj_toolchain && $(MAKE) MAKE="$(MAKE)" configure-target-libgcc touch $@ obj_toolchain/$(TARGET)/libgcc/libgcc.a: | obj_toolchain/$(TARGET)/libgcc/.lc_configured - cd $(dir $@) && $(MAKE) MAKE="$(MAKE)" LC_ROOT=$(PWD) libgcc.a + cd $(dir $@) && $(MAKE) MAKE="$(MAKE)" libgcc.a obj_musl/.lc_built: | obj_musl/.lc_configured cd obj_musl && $(MAKE) $(MUSL_VARS) @@ -181,14 +181,14 @@ obj_sysroot/.lc_libs: | obj_musl/.lc_built touch $@ obj_toolchain/.lc_built: | obj_toolchain/.lc_configured obj_toolchain/gcc/.lc_built - cd obj_toolchain && $(MAKE) MAKE="$(MAKE)" LC_ROOT=$(PWD) + cd obj_toolchain && $(MAKE) MAKE="$(MAKE)" touch $@ install-musl: | obj_musl/.lc_built cd obj_musl && $(MAKE) $(MUSL_VARS) DESTDIR=$(DESTDIR)$(OUTPUT)$(SYSROOT) install install-toolchain: | obj_toolchain/.lc_built - cd obj_toolchain && $(MAKE) MAKE="$(MAKE)" LC_ROOT=$(PWD) DESTDIR=$(DESTDIR)$(OUTPUT) install + cd obj_toolchain && $(MAKE) MAKE="$(MAKE)" DESTDIR=$(DESTDIR)$(OUTPUT) install ln -sf $(TARGET)-gcc $(DESTDIR)$(OUTPUT)/bin/$(TARGET)-cc ifneq ($(LINUX_SRCDIR),)