kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 18:13:49 +01:00
Code Releases Activity

newlib.mk: fix: do not require slash terminated NEWLIB_INCLUDE_DIR

Browse Source 
When NEWLIB_INCLUDE_DIR is set from other parts than 'COMPILER_INCLUDE_PATHS' it
does not have a trailing slash.
Also, it makes it more problematic when supplying it from the command line.

And anyway having two '/' does not break anything.
This commit is contained in:
Gaëtan Harter 2018-06-29 18:21:37 +02:00
parent d4bdac7e5c
commit a946c2c5bd
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefiles/libc/newlib.mk
View File

@ -79,9 +79,9 @@ ifeq ($(TOOLCHAIN),llvm)
endif endif
ifeq (1,$(USE_NEWLIB_NANO)) ifeq (1,$(USE_NEWLIB_NANO))
NEWLIB_NANO_INCLUDE_DIR ?= $(firstword $(wildcard $(NEWLIB_INCLUDE_DIR)newlib-nano \ NEWLIB_NANO_INCLUDE_DIR ?= $(firstword $(wildcard $(NEWLIB_INCLUDE_DIR)/newlib-nano \
$(NEWLIB_INCLUDE_DIR)newlib/nano \ $(NEWLIB_INCLUDE_DIR)/newlib/nano \
$(NEWLIB_INCLUDE_DIR)nano)) $(NEWLIB_INCLUDE_DIR)/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)