Skip to content
Snippets Groups Projects
Commit d4f2070e authored by Joakim Nohlgård's avatar Joakim Nohlgård
Browse files

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.
parent fdf6726a
No related branches found
No related tags found
No related merge requests found
...@@ -175,9 +175,6 @@ export TOOLCHAIN ...@@ -175,9 +175,6 @@ export TOOLCHAIN
# will most likely not need to touch this. # will most likely not need to touch this.
export PREFIX ?= $(if $(TARGET_ARCH),$(TARGET_ARCH)-) export PREFIX ?= $(if $(TARGET_ARCH),$(TARGET_ARCH)-)
# Import all toolchain settings
include $(RIOTCPU)/Makefile.include.$(TOOLCHAIN)
# Add standard include directories # Add standard include directories
INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include INCLUDES += -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/include
INCLUDES += -I$(RIOTCPU)/$(CPU)/include INCLUDES += -I$(RIOTCPU)/$(CPU)/include
...@@ -189,6 +186,9 @@ include $(RIOTBASE)/Makefile.defaultmodules ...@@ -189,6 +186,9 @@ include $(RIOTBASE)/Makefile.defaultmodules
include $(RIOTBOARD)/$(BOARD)/Makefile.include include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTCPU)/$(CPU)/Makefile.include include $(RIOTCPU)/$(CPU)/Makefile.include
# Import all toolchain settings
include $(RIOTCPU)/Makefile.include.$(TOOLCHAIN)
# get number of interfaces straight before resolving dependencies # get number of interfaces straight before resolving dependencies
GNRC_NETIF_NUMOF ?= 1 GNRC_NETIF_NUMOF ?= 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment