From 7a0997d196953ea39f945957faaaa65a4b18684b Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 22 Jun 2016 18:32:56 +0000 Subject: [PATCH] litecross: fix $(TARGET)-based config when value comes from config.mak commit 03bd65562a509ff86bfe8861f8e51e973bcfdd3b 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. --- litecross/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/litecross/Makefile b/litecross/Makefile index aa3ba5f..899f7c7 100644 --- a/litecross/Makefile +++ b/litecross/Makefile @@ -12,6 +12,8 @@ TOOLCHAIN_CONFIG = $(GCC_CONFIG) XGCC_DIR = ../obj_toolchain/gcc XGCC = $(XGCC_DIR)/xgcc -B $(XGCC_DIR) +-include config.mak + ifneq ($(findstring fdpic,$(TARGET)),) GCC_CONFIG += --enable-fdpic endif @@ -37,8 +39,6 @@ GCC_CONFIG += --with-float=hard endif --include config.mak - MAKE += MULTILIB_OSDIRNAMES= MAKE += INFO_DEPS= infodir= MAKE += ac_cv_prog_lex_root=lex.yy.c