X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=toolchain%2FMakefile;h=0336b2f72cee18fefa66cce218c553b9b99a6e30;hb=d3bf5ff9bc7b55b2a3dab93853b33a0cd2c4ca47;hp=7a9730fd681f3a2f0e385e8966212c246696fae0;hpb=f44ae19e1566410b75de5039071a42a0f3ade949;p=openwrt%2Fopenwrt.git diff --git a/toolchain/Makefile b/toolchain/Makefile index 7a9730fd68..0336b2f72c 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -29,7 +29,7 @@ curdir:=toolchain # subdirectories to descend into -$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_INSIGHT),insight) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_YASM),yasm) +$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_NASM),nasm) ifdef CONFIG_USE_UCLIBC $(curdir)/builddirs += $(LIBC)/utils endif @@ -70,6 +70,7 @@ endif endif ifdef CONFIG_BUILDBOT +ifneq ($(wildcard $(TOPDIR)/.git),) $(TOOLCHAIN_DIR)/stamp/.ver_check: $(TMP_DIR)/.build cd "$(TOPDIR)"; git log --format=%h -1 toolchain > $(TMP_DIR)/.ver_check cmp -s $(TMP_DIR)/.ver_check $@ || { \ @@ -80,6 +81,7 @@ ifdef CONFIG_BUILDBOT $(TOOLCHAIN_DIR)/info.mk $(STAGING_DIR)/.prepared: $(TOOLCHAIN_DIR)/stamp/.ver_check endif +endif # prerequisites for the individual targets $(curdir)/ := .config prereq