Skip to content

Commit 79dad7c

Browse files
committed
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.
1 parent 8bf468e commit 79dad7c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

makefiles/libc/newlib.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ ifeq ($(TOOLCHAIN),llvm)
7272
endif
7373

7474
ifeq (1,$(USE_NEWLIB_NANO))
75-
NEWLIB_NANO_INCLUDE_DIR ?= $(firstword $(wildcard $(NEWLIB_INCLUDE_DIR)newlib-nano \
76-
$(NEWLIB_INCLUDE_DIR)newlib/nano \
77-
$(NEWLIB_INCLUDE_DIR)nano))
75+
NEWLIB_NANO_INCLUDE_DIR ?= $(firstword $(wildcard $(NEWLIB_INCLUDE_DIR)/newlib-nano \
76+
$(NEWLIB_INCLUDE_DIR)/newlib/nano \
77+
$(NEWLIB_INCLUDE_DIR)/nano))
7878
# newlib-nano overrides newlib.h and its include dir should therefore go before
7979
# the regular system include dirs.
8080
INCLUDES := -isystem $(NEWLIB_NANO_INCLUDE_DIR) $(INCLUDES)

0 commit comments

Comments
 (0)