From a946c2c5bd86c0be599c7251d79d13faba0c537e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= <gaetan.harter@fu-berlin.de> Date: Fri, 29 Jun 2018 18:21:37 +0200 Subject: [PATCH] newlib.mk: fix: do not require slash terminated NEWLIB_INCLUDE_DIR 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. --- makefiles/libc/newlib.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makefiles/libc/newlib.mk b/makefiles/libc/newlib.mk index c61370a5d8..c22a95046b 100644 --- a/makefiles/libc/newlib.mk +++ b/makefiles/libc/newlib.mk @@ -79,9 +79,9 @@ ifeq ($(TOOLCHAIN),llvm) endif ifeq (1,$(USE_NEWLIB_NANO)) - NEWLIB_NANO_INCLUDE_DIR ?= $(firstword $(wildcard $(NEWLIB_INCLUDE_DIR)newlib-nano \ - $(NEWLIB_INCLUDE_DIR)newlib/nano \ - $(NEWLIB_INCLUDE_DIR)nano)) + NEWLIB_NANO_INCLUDE_DIR ?= $(firstword $(wildcard $(NEWLIB_INCLUDE_DIR)/newlib-nano \ + $(NEWLIB_INCLUDE_DIR)/newlib/nano \ + $(NEWLIB_INCLUDE_DIR)/nano)) # newlib-nano overrides newlib.h and its include dir should therefore go before # the regular system include dirs. INCLUDES := -isystem $(NEWLIB_NANO_INCLUDE_DIR) $(INCLUDES) -- GitLab