riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

newlib-nano: add include directory

Browse Source 
The newlib-nano include directory can be named either newlib-nano or
nano, so we should make sure it is added in both cases.
This commit is contained in:
Toon Stegen 2018-05-04 15:58:09 +02:00 committed by Joakim Nohlgård
parent 6f5db1c954
commit 88aaa62364
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefiles/libc/newlib.mk
View File

@ -64,7 +64,8 @@ ifeq ($(TOOLCHAIN),llvm)
endif endif
ifeq (1,$(USE_NEWLIB_NANO)) ifeq (1,$(USE_NEWLIB_NANO))
NEWLIB_NANO_INCLUDE_DIR ?= $(NEWLIB_INCLUDE_DIR)/newlib-nano # newlib-nano include directory is called either newlib-nano or nano. Use the one we find first.
NEWLIB_NANO_INCLUDE_DIR ?= $(firstword $(wildcard $(addprefix $(NEWLIB_INCLUDE_DIR)/, newlib-nano nano)))
# newlib-nano overrides newlib.h and its include dir should therefore go before # newlib-nano overrides newlib.h and its include dir should therefore go before
# the regular system include dirs. # the regular system include dirs.
INCLUDES := -isystem $(NEWLIB_NANO_INCLUDE_DIR) $(INCLUDES) INCLUDES := -isystem $(NEWLIB_NANO_INCLUDE_DIR) $(INCLUDES)