Use --sysroot when cross compiling.

As CMAKE_ROOT_FIND_PATH can be a list, a new CMAKE_SYSROOT is
introduced, which is never a list.

The contents of this variable is passed to supporting compilers
as --sysroot. It is also accounted for when processing implicit
link directories reported by the compiler, and when generating
RPATH information.

1 files changed, 16 insertions, 0 deletions

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index e4219a9..271183e 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -365,6 +365,22 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   vars.TargetVersionMajor = targetVersionMajor.c_str();
   vars.TargetVersionMinor = targetVersionMinor.c_str();
 
+  if (const char *rootPath =
+                    this->Makefile->GetDefinition("CMAKE_SYSROOT"))
+    {
+    if (*rootPath)
+      {
+      if (const char *sysrootFlag =
+                      this->Makefile->GetDefinition("CMAKE_SYSROOT_FLAG"))
+        {
+        flags += " ";
+        flags += sysrootFlag;
+        flags += this->LocalGenerator->EscapeForShell(rootPath);
+        flags += " ";
+        }
+      }
+    }
+
   vars.LinkLibraries = linkLibs.c_str();
   vars.Flags = flags.c_str();
   vars.LinkFlags = linkFlags.c_str();