diff mbox

pkg-cmake.mk: set CMAKE_SYSROOT variable in toolchainfile.cmake

Message ID 20160817211936.18458-1-s.martin49@gmail.com
State Accepted
Headers show

Commit Message

Samuel Martin Aug. 17, 2016, 9:19 p.m. UTC
This change enforces the CMAKE_SYSROOT value set in the toolchainfile.cmake.

This fix overrides the CMake heuristics used to guess it, and turns off some
non-desirable behavior adding "-isystem ..." flags to the compiler command
line, misleading the compiler and making the build failed due to some
unfound standard headers.

Fixes:
  http://autobuild.buildroot.net/results/f7e/f7e92678e91a6cb15ccf32d4a7d75b39f49d6000/defconfig
  (and others)

Cc: Ben Boeckel <mathstuf@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 support/misc/toolchainfile.cmake.in | 1 +
 1 file changed, 1 insertion(+)

Comments

Thomas Petazzoni Aug. 18, 2016, 8:27 p.m. UTC | #1
Hello,

On Wed, 17 Aug 2016 23:19:36 +0200, Samuel Martin wrote:
> This change enforces the CMAKE_SYSROOT value set in the toolchainfile.cmake.
> 
> This fix overrides the CMake heuristics used to guess it, and turns off some
> non-desirable behavior adding "-isystem ..." flags to the compiler command
> line, misleading the compiler and making the build failed due to some
> unfound standard headers.
> 
> Fixes:
>   http://autobuild.buildroot.net/results/f7e/f7e92678e91a6cb15ccf32d4a7d75b39f49d6000/defconfig
>   (and others)
> 
> Cc: Ben Boeckel <mathstuf@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  support/misc/toolchainfile.cmake.in | 1 +
>  1 file changed, 1 insertion(+)

Applied to master, thanks.

Thomas
diff mbox

Patch

diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in
index e550b8f..649b52d 100644
--- a/support/misc/toolchainfile.cmake.in
+++ b/support/misc/toolchainfile.cmake.in
@@ -19,6 +19,7 @@  set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@ ${CMAKE_EXE_LINKER_FLAGS}" CACHE
 set(CMAKE_INSTALL_SO_NO_EXE 0)
 
 set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/usr/bin")
+set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")
 set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)