X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Makefile;h=59ec83a6a1a6ec94f0dc157b05208fe440b3b2b5;hb=63d053d8c3e991d86cbacccb9ba6ff03aedee5cd;hp=0a5f869299c84a28f3d6ee8da3493e605fe39042;hpb=e9a25ac92495d8276669574e03d3b03e9846dd1c;p=oweals%2Fbusybox.git diff --git a/Makefile b/Makefile index 0a5f86929..59ec83a6a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION = 1 -PATCHLEVEL = 28 +PATCHLEVEL = 30 SUBLEVEL = 0 EXTRAVERSION = .git NAME = Unnamed @@ -178,7 +178,7 @@ endif # SUBARCH is subsequently ignored. ifneq ($(CROSS_COMPILE),) -SUBARCH := $(shell echo $(CROSS_COMPILE) | cut -d- -f1) +SUBARCH := $(shell echo $(CROSS_COMPILE) | cut -d- -f1 | sed 's:^.*/::g') else SUBARCH := $(shell uname -m) endif @@ -368,7 +368,7 @@ gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) # we depend on scripts_basic, since scripts/basic/fixdep # must be built before any other host prog PHONY += applets_dir -applets_dir: scripts_basic gen_build_files +applets_dir: scripts_basic gen_build_files include/config/MARKER $(Q)$(MAKE) $(build)=applets applets/%: applets_dir ; @@ -470,6 +470,7 @@ libs-y := \ coreutils/ \ coreutils/libcoreutils/ \ debianutils/ \ + klibc-utils/ \ e2fsprogs/ \ editors/ \ findutils/ \