From ba282bd30dfba7ebee141840cb3a5ba85f96c045 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Mon, 18 Jan 2016 23:56:58 -0800 Subject: [PATCH] Require HEXAGON_ARM_SYSROOT for arm-linux-gnueabihf The Toolchain-arm-linux-gnueabihf.cmake is currently used for the SnapdragonFlight Apps processor. The sysroot is required for cross building for Ubuntu 14.04 armhf. Signed-off-by: Mark Charlebois --- cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake b/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake index 0f1f26d76a..59ad2061e8 100644 --- a/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake +++ b/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake @@ -75,11 +75,7 @@ foreach(tool echo patch grep rm mkdir nm genromfs cp touch make unzip) endif() endforeach() -<<<<<<< ce0aecb062077c0c99423a12eea9ccb36adbd065 set(C_FLAGS "--sysroot=${HEXAGON_ARM_SYSROOT}") -======= -set(C_FLAGS "--sysroot=${HEXAGON_SDK_ROOT}/sysroot") ->>>>>>> Rebase changes on upstream master set(LINKER_FLAGS "-Wl,-gc-sections") set(CMAKE_EXE_LINKER_FLAGS ${LINKER_FLAGS}) set(CMAKE_C_FLAGS ${C_FLAGS})