OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 27... Line 27...
27 # For musl, steps 2 and 4 are skipped, and step 3 is done after 5 27 # For musl, steps 2 and 4 are skipped, and step 3 is done after 5
Line 28... Line 28...
28   28  
Line 29... Line 29...
29 curdir:=toolchain 29 curdir:=toolchain
30   30  
31 # subdirectories to descend into 31 # subdirectories to descend into
32 $(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) 32 $(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_YASM),yasm)
33 ifdef CONFIG_USE_UCLIBC 33 ifdef CONFIG_USE_UCLIBC
Line 34... Line 34...
34 $(curdir)/builddirs += $(LIBC)/utils 34 $(curdir)/builddirs += $(LIBC)/utils
Line 68... Line 68...
68 @touch $@ 68 @touch $@
69 endif 69 endif
70 endif 70 endif
Line 71... Line 71...
71   71  
72 ifdef CONFIG_BUILDBOT -  
73 ifneq ($(wildcard $(TOPDIR)/.git),) 72 ifdef CONFIG_BUILDBOT
74 $(TOOLCHAIN_DIR)/stamp/.ver_check: $(TMP_DIR)/.build 73 $(TOOLCHAIN_DIR)/stamp/.ver_check: $(TMP_DIR)/.build
75 cd "$(TOPDIR)"; git log --format=%h -1 toolchain > $(TMP_DIR)/.ver_check 74 cd "$(TOPDIR)"; git log --format=%h -1 toolchain > $(TMP_DIR)/.ver_check
76 cmp -s $(TMP_DIR)/.ver_check $@ || { \ 75 cmp -s $(TMP_DIR)/.ver_check $@ || { \
77 rm -rf $(BUILD_DIR) $(STAGING_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR_TOOLCHAIN); \ 76 rm -rf $(BUILD_DIR) $(STAGING_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR_TOOLCHAIN); \
78 mkdir -p $(TOOLCHAIN_DIR)/stamp; \ 77 mkdir -p $(TOOLCHAIN_DIR)/stamp; \
79 mv $(TMP_DIR)/.ver_check $@; \ 78 mv $(TMP_DIR)/.ver_check $@; \
Line 80... Line 79...
80 } 79 }
81   80  
82 $(TOOLCHAIN_DIR)/info.mk $(STAGING_DIR)/.prepared: $(TOOLCHAIN_DIR)/stamp/.ver_check -  
Line 83... Line 81...
83 endif 81 $(TOOLCHAIN_DIR)/info.mk $(STAGING_DIR)/.prepared: $(TOOLCHAIN_DIR)/stamp/.ver_check
84 endif 82 endif
85   83