From f1c53794fa9b6d561f287f8f3bf019e44c4b731c Mon Sep 17 00:00:00 2001 From: Toon Stegen <tstegen@nalys-group.com> Date: Wed, 30 May 2018 17:38:24 +0200 Subject: [PATCH] Revert "newlib-nano: add include directory" This reverts commit 88aaa623641753c1b9eb164b9b1114e9c2c0700c. --- makefiles/libc/newlib.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/makefiles/libc/newlib.mk b/makefiles/libc/newlib.mk index 5b9c305ba2..d02b1a8fa0 100644 --- a/makefiles/libc/newlib.mk +++ b/makefiles/libc/newlib.mk @@ -64,8 +64,7 @@ ifeq ($(TOOLCHAIN),llvm) endif ifeq (1,$(USE_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_INCLUDE_DIR ?= $(NEWLIB_INCLUDE_DIR)/newlib-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