| From 2c240f131ae5cc981702b45397be3b311c67a9ee Mon Sep 17 00:00:00 2001 |
| From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| Date: Fri, 14 Jul 2017 22:23:46 +0200 |
| Subject: [PATCH] Makefile: include per-arch Makefile before Makefile.flags |
| |
| Makefile.flags contains: |
| |
| ARCH_FPIC ?= -fpic |
| ARCH_FPIE ?= -fpie |
| |
| However, arch/$(ARCH)/Makefile gets included *after* Makefile.flags, |
| and therefore doesn't get the chance to provide its own value. |
| |
| Fix this by including arch/$(ARCH)/Makefile *before* Makefile.flags. |
| |
| [Submitted upstream: http://lists.busybox.net/pipermail/busybox/2017-July/085632.html] |
| Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
| --- |
| Makefile | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/Makefile b/Makefile |
| index 971e68e..fe85070 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -508,6 +508,8 @@ ifeq ($(dot-config),1) |
| # To avoid any implicit rule to kick in, define an empty command |
| .config .kconfig.d: ; |
| |
| +-include $(srctree)/arch/$(ARCH)/Makefile |
| + |
| # Now we can define CFLAGS etc according to .config |
| include $(srctree)/Makefile.flags |
| |
| @@ -531,8 +533,6 @@ endif |
| # Defaults busybox but it is usually overridden in the arch makefile |
| all: busybox doc |
| |
| --include $(srctree)/arch/$(ARCH)/Makefile |
| - |
| # arch Makefile may override CC so keep this after arch Makefile is included |
| #bbox# NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) |
| CHECKFLAGS += $(NOSTDINC_FLAGS) |
| -- |
| 2.9.4 |
| |
