marc
/
RIOT
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make: Correct multilib detection when using LLVM 

The LLVM makefile needs to be included _after_ the CPU makefiles have
set their CFLAGS in order to get the right multilib directory from GCC.
This commit is contained in:
Joakim Nohlgård 2016-12-21 13:03:58 +01:00
parent fdf6726ab5
commit d4f2070e8b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.include
View File

@ -175,9 +175,6 @@ export TOOLCHAIN
# will most likely not need to touch this.
export PREFIX ?= $(if $(TARGET_ARCH),$(TARGET_ARCH)-)
# Import all toolchain settings
include $(RIOTCPU)/Makefile.include.$(TOOLCHAIN)
# Add standard include directories
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
INCLUDES += -I$(RIOTCPU)/$(CPU)/include
@ -189,6 +186,9 @@ include $(RIOTBASE)/Makefile.defaultmodules
include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTCPU)/$(CPU)/Makefile.include
# Import all toolchain settings
include $(RIOTCPU)/Makefile.include.$(TOOLCHAIN)
# get number of interfaces straight before resolving dependencies
GNRC_NETIF_NUMOF ?= 1