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

Merge pull request #11145 from kaspar030/test_newlib_nano_path_empty

Browse Source 
make: newlib: check if newlib nano folder was found
This commit is contained in:
Juan I Carrano 2019-03-11 14:55:10 +01:00 committed by GitHub
commit f7cdbdaab0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makefiles/libc/newlib.mk
View File

@ -93,6 +93,11 @@ 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))
ifeq (,$(NEWLIB_NANO_INCLUDE_DIR))
$(error USE_NEWLIB_NANO==1 but nano include folder not found!)
endif
# 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)