summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 3289c12..e0397f0 100644
--- a/Makefile
+++ b/Makefile
@@ -172,6 +172,7 @@ $(CROSSTOOL_PATH)/bin/ct-ng:
# ------- Build linux64 cross compilers for windows, arm and linux native compiler
prepare-configfile:
+ cd $(shell dirname $(CONFIGFILE)); $(CROSSTOOL_PATH)/bin/ct-ng upgradeconfig
bash $(TOP)/contrib/config.sh --file $(CONFIGFILE) --set-str CT_GCC_VERSION $(VERSION_GCC); \
bash $(TOP)/contrib/config.sh --file $(CONFIGFILE) --set-str CT_BINUTILS_VERSION $(VERSION_BINUTILS); \
bash $(TOP)/contrib/config.sh --file $(CONFIGFILE) --set-str CT_GMP_VERSION $(VERSION_GMP); \
@@ -187,7 +188,6 @@ prepare-configfile:
bash $(TOP)/contrib/config.sh --file $(CONFIGFILE) --set-val CT_GLIBC_KERNEL_VERSION_CHOSEN y ;\
bash $(TOP)/contrib/config.sh --file $(CONFIGFILE) --set-str CT_GLIBC_MIN_KERNEL_VERSION "$(VERSION_LINUX_MIN)" ;\
bash $(TOP)/contrib/config.sh --file $(CONFIGFILE) --set-val CT_SHOW_CT_VERSION n
- cd $(shell dirname $(CONFIGFILE)); $(CROSSTOOL_PATH)/bin/ct-ng upgradeconfig
lin-cross:
mkdir -p $(CT_PREFIX)
@@ -198,6 +198,7 @@ lin-cross:
mkdir -p $(TOP)/build-$$tuple; \
cd $(TOP)/build-$$tuple; \
cp -f $$c .config; \
+ $(CROSSTOOL_PATH)/bin/ct-ng upgradeconfig; \
bash $(TOP)/contrib/config.sh --set-str CT_GCC_VERSION $(VERSION_GCC); \
bash $(TOP)/contrib/config.sh --set-str CT_BINUTILS_VERSION $(VERSION_BINUTILS); \
bash $(TOP)/contrib/config.sh --set-str CT_GMP_VERSION $(VERSION_GMP); \
@@ -224,7 +225,6 @@ lin-cross:
if [ "$$tuple" = "x86_64-pc-linux-gnu" ]; then \
bash $(TOP)/contrib/config.sh --set-val CT_STATIC_TOOLCHAIN=n ;\
fi; \
- $(CROSSTOOL_PATH)/bin/ct-ng upgradeconfig; \
bash $(TOP)/contrib/config.sh --undefine CT_LOG_PROGRESS_BAR ;\
bash $(TOP)/contrib/config.sh --set-val CT_PARALLEL_JOBS 4; \
bash $(TOP)/contrib/config.sh --set-str CT_TOOLCHAIN_PKGVERSION $(PKGVERSION); \