emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: include per-arch Makefile before Makefile.flags

Browse Source 
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.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Thomas Petazzoni 2017-07-14 23:08:38 +02:00 committed by Denys Vlasenko
parent e5b1f5af73
commit e9a25ac924
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -508,6 +508,8 @@ ifeq ($(dot-config),1)
# To avoid any implicit rule to kick in, define an empty command # To avoid any implicit rule to kick in, define an empty command
.config .kconfig.d: ; .config .kconfig.d: ;
-include $(srctree)/arch/$(ARCH)/Makefile
# Now we can define CFLAGS etc according to .config # Now we can define CFLAGS etc according to .config
include $(srctree)/Makefile.flags include $(srctree)/Makefile.flags
@ -531,8 +533,6 @@ endif
# Defaults busybox but it is usually overridden in the arch makefile # Defaults busybox but it is usually overridden in the arch makefile
all: busybox doc all: busybox doc
-include $(srctree)/arch/$(ARCH)/Makefile
# arch Makefile may override CC so keep this after arch Makefile is included # arch Makefile may override CC so keep this after arch Makefile is included
#bbox# NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include) #bbox# NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS) CHECKFLAGS += $(NOSTDINC_FLAGS)