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

litecross: fix $(TARGET)-based config when value comes from config.mak 

commit 03bd65562a wrongly placed the
logic conditional on $(TARGET) before inclusion of config.mak, so that
it only worked when TARGET was set from the make command line or
environment. reorder to fix.
This commit is contained in:
Rich Felker 2016-06-22 18:32:56 +00:00
parent 347bfc9f61
commit 7a0997d196
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
litecross/Makefile
View File

@ -12,6 +12,8 @@ TOOLCHAIN_CONFIG = $(GCC_CONFIG)
XGCC_DIR = ../obj_toolchain/gcc XGCC_DIR = ../obj_toolchain/gcc
XGCC = $(XGCC_DIR)/xgcc -B $(XGCC_DIR) XGCC = $(XGCC_DIR)/xgcc -B $(XGCC_DIR)
-include config.mak
ifneq ($(findstring fdpic,$(TARGET)),) ifneq ($(findstring fdpic,$(TARGET)),)
GCC_CONFIG += --enable-fdpic GCC_CONFIG += --enable-fdpic
endif endif
@ -37,8 +39,6 @@ GCC_CONFIG += --with-float=hard
endif endif
-include config.mak
MAKE += MULTILIB_OSDIRNAMES= MAKE += MULTILIB_OSDIRNAMES=
MAKE += INFO_DEPS= infodir= MAKE += INFO_DEPS= infodir=
MAKE += ac_cv_prog_lex_root=lex.yy.c MAKE += ac_cv_prog_lex_root=lex.yy.c