marvin.weiler
/
musl-cross-make
mirror of https://github.com/richfelker/musl-cross-make.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Szabolcs Nagy 2016-07-19 19:43:08 +00:00 committed by Rich Felker
parent 99ee12d604
commit 829d4e32fe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
litecross/Makefile
View File

@ -51,7 +51,7 @@ 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='$$(LC_ROOT)/obj_sysroot' \ --with-build-sysroot=$(PWD)/obj_sysroot \
--enable-tls \ --enable-tls \
--disable-libmudflap --disable-libsanitizer \ --disable-libmudflap --disable-libsanitizer \
--disable-gnu-indirect-function \ --disable-gnu-indirect-function \
@ -154,7 +154,7 @@ obj_toolchain/.lc_configured: | obj_toolchain src_toolchain
touch $@ touch $@
obj_toolchain/gcc/.lc_built: | obj_toolchain/.lc_configured obj_sysroot/usr obj_sysroot/lib64 obj_sysroot/include 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 $@ touch $@
obj_musl/.lc_configured: | obj_toolchain/gcc/.lc_built obj_musl src_musl 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 $@ touch $@
obj_toolchain/$(TARGET)/libgcc/.lc_configured: | obj_sysroot/.lc_headers 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 $@ touch $@
obj_toolchain/$(TARGET)/libgcc/libgcc.a: | obj_toolchain/$(TARGET)/libgcc/.lc_configured 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 obj_musl/.lc_built: | obj_musl/.lc_configured
cd obj_musl && $(MAKE) $(MUSL_VARS) cd obj_musl && $(MAKE) $(MUSL_VARS)
@ -181,14 +181,14 @@ obj_sysroot/.lc_libs: | obj_musl/.lc_built
touch $@ touch $@
obj_toolchain/.lc_built: | obj_toolchain/.lc_configured obj_toolchain/gcc/.lc_built 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 $@ touch $@
install-musl: | obj_musl/.lc_built install-musl: | obj_musl/.lc_built
cd obj_musl && $(MAKE) $(MUSL_VARS) DESTDIR=$(DESTDIR)$(OUTPUT)$(SYSROOT) install cd obj_musl && $(MAKE) $(MUSL_VARS) DESTDIR=$(DESTDIR)$(OUTPUT)$(SYSROOT) install
install-toolchain: | obj_toolchain/.lc_built 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 ln -sf $(TARGET)-gcc $(DESTDIR)$(OUTPUT)/bin/$(TARGET)-cc
ifneq ($(LINUX_SRCDIR),) ifneq ($(LINUX_SRCDIR),)