From d3f625b60e1033855a57a61225bf678dce2fd86c Mon Sep 17 00:00:00 2001 From: Sakari Poussa Date: Thu, 12 May 2016 08:39:01 +0300 Subject: [PATCH] toolchain/xtools: enhance include search path to sysroot For xtools, add sysroot also to include search path. Change-Id: I72d37c54eb7f3693d3a207a35802b29b150c84f1 Signed-off-by: Sakari Poussa --- scripts/Makefile.toolchain.xtools | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.toolchain.xtools b/scripts/Makefile.toolchain.xtools index d801cce71b6..5f8dfe74ee9 100644 --- a/scripts/Makefile.toolchain.xtools +++ b/scripts/Makefile.toolchain.xtools @@ -5,18 +5,21 @@ endif CROSS_COMPILE_TARGET_arm = arm-none-eabi CROSS_COMPILE_arm=${XTOOLS_TOOLCHAIN_PATH}/${CROSS_COMPILE_TARGET_arm}/bin/${CROSS_COMPILE_TARGET_arm}- CROSS_COMPILE_arm_version ?= $(shell $(CROSS_COMPILE_arm)gcc -dumpversion) +TOOLCHAIN_CFLAGS_arm = -I${XTOOLS_TOOLCHAIN_PATH}/${CROSS_COMPILE_TARGET_arm}/${CROSS_COMPILE_TARGET_arm}/sysroot/usr/include CROSS_COMPILE_TARGET_x86 = i586-pc-elf CROSS_COMPILE_x86=${XTOOLS_TOOLCHAIN_PATH}/${CROSS_COMPILE_TARGET_x86}/bin/${CROSS_COMPILE_TARGET_x86}- CROSS_COMPILE_x86_version ?= $(shell $(CROSS_COMPILE_x86)gcc -dumpversion) +TOOLCHAIN_CFLAGS_x86 = -I${XTOOLS_TOOLCHAIN_PATH}/${CROSS_COMPILE_TARGET_x86}/${CROSS_COMPILE_TARGET_x86}/sysroot/usr/include CROSS_COMPILE= $(CROSS_COMPILE_$(ARCH)) CROSS_COMPILE_TARGET = ${CROSS_COMPILE_TARGET_${ARCH}} CROSS_COMPILE_version = ${CROSS_COMPILE_${ARCH}_version} +TOOLCHAIN_CFLAGS = ${TOOLCHAIN_CFLAGS_${ARCH}} TOOLCHAIN_LIBS = gcc LIB_INCLUDE_DIR += -L ${XTOOLS_TOOLCHAIN_PATH}/${CROSS_COMPILE_TARGET}/lib/gcc/${CROSS_COMPILE_TARGET}/${CROSS_COMPILE_version}/ -export CROSS_COMPILE TOOLCHAIN_LIBS LIB_INCLUDE_DIR +export CROSS_COMPILE TOOLCHAIN_LIBS LIB_INCLUDE_DIR TOOLCHAIN_CFLAGS