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

slibtool support: remove the LIBTOOL_STATIC_ARG var (no longer needed). 

Beginning with slibtool version 0.5.26 and the introduction of the
rlibtool symlink (the equivalent of slibtool --heuristics), slibtool
may now be told to automatically detect its desired operation mode
(share-only, static-only, or both) by way of parsing the generated
libtool script which it replaces.
This commit is contained in:
midipix 2018-10-29 23:01:00 -04:00 committed by Rich Felker
parent edc9d8e2f0
commit 0b2487ef91
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
litecross/Makefile
View File

@ -48,14 +48,7 @@ GCC_CONFIG_FOR_TARGET += --with-float=hard
endif endif
ifneq ($(LIBTOOL),) ifneq ($(LIBTOOL),)
LIBTOOL_ARG = LIBTOOL=$(LIBTOOL)
ifeq ($(LIBTOOL_STATIC),)
LIBTOOL_STATIC = $(LIBTOOL)-static
endif
LIBTOOL_ARG = LIBTOOL=$(LIBTOOL)
LIBTOOL_STATIC_ARG = LIBTOOL=$(LIBTOOL_STATIC)
endif endif
MAKE += MULTILIB_OSDIRNAMES= MAKE += MULTILIB_OSDIRNAMES=
@ -207,7 +200,7 @@ obj_binutils/.lc_configured: | obj_binutils src_binutils
touch $@ touch $@
obj_binutils/.lc_built: | obj_binutils/.lc_configured obj_binutils/.lc_built: | obj_binutils/.lc_configured
cd obj_binutils && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_STATIC_ARG)" all cd obj_binutils && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_ARG)" all
touch $@ touch $@
obj_gcc/.lc_configured: | obj_gcc src_gcc obj_gcc/.lc_configured: | obj_gcc src_gcc
@ -215,15 +208,15 @@ obj_gcc/.lc_configured: | obj_gcc src_gcc
touch $@ touch $@
obj_gcc/.lc_gmp_built: | obj_gcc/.lc_configured obj_gcc/.lc_gmp_built: | obj_gcc/.lc_configured
cd obj_gcc && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_STATIC_ARG)" all-gmp cd obj_gcc && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_ARG)" all-gmp
touch $@ touch $@
obj_gcc/.lc_mpfr_built: | obj_gcc/.lc_gmp_built obj_gcc/.lc_mpfr_built: | obj_gcc/.lc_gmp_built
cd obj_gcc && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_STATIC_ARG)" all-mpfr cd obj_gcc && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_ARG)" all-mpfr
touch $@ touch $@
obj_gcc/.lc_mpc_built: | obj_gcc/.lc_mpfr_built obj_gcc/.lc_mpc_built: | obj_gcc/.lc_mpfr_built
cd obj_gcc && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_STATIC_ARG)" all-mpc cd obj_gcc && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_ARG)" all-mpc
touch $@ touch $@
obj_gcc/gcc/.lc_built: | obj_gcc/.lc_mpc_built obj_gcc/gcc/.lc_built: | obj_gcc/.lc_mpc_built
@ -257,7 +250,7 @@ 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-binutils: | obj_binutils/.lc_built install-binutils: | obj_binutils/.lc_built
cd obj_binutils && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_STATIC_ARG)" DESTDIR=$(DESTDIR)$(OUTPUT) install cd obj_binutils && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_ARG)" DESTDIR=$(DESTDIR)$(OUTPUT) install
install-gcc: | obj_gcc/.lc_built install-gcc: | obj_gcc/.lc_built
cd obj_gcc && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_ARG)" DESTDIR=$(DESTDIR)$(OUTPUT) install cd obj_gcc && $(MAKE) MAKE="$(MAKE) $(LIBTOOL_ARG)" DESTDIR=$(DESTDIR)$(OUTPUT) install