diff options
author | Ron Yorston <rmy@pobox.com> | 2017-07-18 15:58:52 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-07-18 15:58:52 +0100 |
commit | b680f05ad449505e3d914bebd4c8d83bf768c094 (patch) | |
tree | c08ded13d430b0e7e0104f2eb594fad190ce98a3 /Makefile | |
parent | 258200ff81d5a9da54dab35acf36213eff1e399b (diff) | |
parent | 513a2457b65894b10b9fd6aa8753fca59eced08c (diff) | |
download | busybox-w32-b680f05ad449505e3d914bebd4c8d83bf768c094.tar.gz busybox-w32-b680f05ad449505e3d914bebd4c8d83bf768c094.tar.bz2 busybox-w32-b680f05ad449505e3d914bebd4c8d83bf768c094.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,5 +1,5 @@ | |||
1 | VERSION = 1 | 1 | VERSION = 1 |
2 | PATCHLEVEL = 27 | 2 | PATCHLEVEL = 28 |
3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
4 | EXTRAVERSION = .git | 4 | EXTRAVERSION = .git |
5 | NAME = Unnamed | 5 | NAME = Unnamed |
@@ -510,6 +510,8 @@ ifeq ($(dot-config),1) | |||
510 | # To avoid any implicit rule to kick in, define an empty command | 510 | # To avoid any implicit rule to kick in, define an empty command |
511 | .config .kconfig.d: ; | 511 | .config .kconfig.d: ; |
512 | 512 | ||
513 | -include $(srctree)/arch/$(ARCH)/Makefile | ||
514 | |||
513 | # Now we can define CFLAGS etc according to .config | 515 | # Now we can define CFLAGS etc according to .config |
514 | include $(srctree)/Makefile.flags | 516 | include $(srctree)/Makefile.flags |
515 | 517 | ||
@@ -533,8 +535,6 @@ endif | |||
533 | # Defaults busybox but it is usually overridden in the arch makefile | 535 | # Defaults busybox but it is usually overridden in the arch makefile |
534 | all: busybox$(EXEEXT) doc | 536 | all: busybox$(EXEEXT) doc |
535 | 537 | ||
536 | -include $(srctree)/arch/$(ARCH)/Makefile | ||
537 | |||
538 | # arch Makefile may override CC so keep this after arch Makefile is included | 538 | # arch Makefile may override CC so keep this after arch Makefile is included |
539 | #bbox# NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) | 539 | #bbox# NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) |
540 | CHECKFLAGS += $(NOSTDINC_FLAGS) | 540 | CHECKFLAGS += $(NOSTDINC_FLAGS) |