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

Merge pull request #5053 from gebart/pr/newlib-includes-fix

Browse Source 
sys/newlib: Improve robustness in include path search
This commit is contained in:
Ludwig Knüpfer 2016-03-13 18:28:46 +01:00
commit 3955f59f17
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/newlib/Makefile.include
View File

@ -30,4 +30,11 @@ NEWLIB_INCLUDES ?= \
$(foreach pat, $(NEWLIB_INCLUDE_PATTERNS), $(wildcard $(pat))), \
-isystem $(dir))
export INCLUDES += $(NEWLIB_INCLUDES)
# If nothing was found we will try to fall back to searching for a cross-gcc in
# the current PATH and use a relative path for the includes
ifeq (,$(NEWLIB_INCLUDES))
NEWLIB_INCLUDES := $(addprefix -isystem ,$(wildcard $(dir $(shell which $(PREFIX)gcc))../$(TARGET_TRIPLE)/include))
endif
# Newlib includes should go before GCC includes.
export INCLUDES := $(NEWLIB_INCLUDES) $(INCLUDES)