1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Revert "newlib: don't use -isystem for default includes"

This reverts commit fb3c2b2bc9.

The reverted commit broke Clang compilation.
This commit is contained in:
Joakim Nohlgård 2016-12-20 17:33:00 +01:00
parent ae1bf7e493
commit d33dd06f73

View File

@ -17,7 +17,6 @@ endif
export LINKFLAGS += -lc -lnosys
ifeq (1,$(USE_NEWLIB_NANO))
# Search for Newlib include directories
# Since Clang is not installed as a separate instance for each crossdev target
@ -51,10 +50,14 @@ NEWLIB_INCLUDE_DIR ?= $(firstword $(wildcard $(NEWLIB_INCLUDE_PATTERNS)))
ifeq (,$(NEWLIB_INCLUDE_DIR))
NEWLIB_INCLUDE_DIR := $(abspath $(wildcard $(dir $(shell which $(PREFIX)gcc))../$(TARGET_ARCH)/include))
endif
NEWLIB_INCLUDES := -isystem $(NEWLIB_INCLUDE_DIR)
ifeq (1,$(USE_NEWLIB_NANO))
NEWLIB_NANO_INCLUDE_DIR ?= $(NEWLIB_INCLUDE_DIR)/nano
# newlib-nano overrides newlib.h and its include dir should therefore go before
# the regular newlib include dir.
NEWLIB_INCLUDES := -isystem $(NEWLIB_NANO_INCLUDE_DIR)
NEWLIB_INCLUDES := -isystem $(NEWLIB_NANO_INCLUDE_DIR) $(NEWLIB_INCLUDES)
endif
# Newlib includes should go before GCC includes.