commit 50245735ce78c9a64bf239e9216486ea897e68d3
author Joshua Conner <joshconner@google.com> Tue Jan 10 21:29:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 10 21:29:58 2017 +0000
tree 4ad44ae39b3134da58433770a3db33c04e01cba1
parent 7fe54169300142462f67d1db5bb91a95b27a3164
parent 6d60d22ad51e2879d2d8d3237f85b94d4af9af5f

Merge "Additional sysroot checks."

do-build

diff --git a/do-build b/do-build
index d5df0fc..041198a 100755
--- a/do-build
+++ b/do-build
@@ -298,9 +298,19 @@
     die "Configuration not supported. Use --force to try anyway."
   fi
 
-  if [ "$BUILD" != "$HOST" ] && [ -z "$SYSROOT" ] && [ -z "$force" ]
+  if [ -z "$SYSROOT" ] && [ -z "$force" ]
   then
-    die "Sysroot expected when host differs from build system. Use --force to try anyway."
+    if [ "$BUILD" != "$HOST" ]
+    then
+      die "Sysroot expected when host differs from build system. Use --force to try anyway."
+    fi
+
+    split_arch_os "$TARGET"
+    local target_os="$RESULT_OS"
+    if [ "$BUILD" != "$TARGET" ] && [ "$target_os" != "none" ]
+    then
+      die "Sysroot expected when target OS differs build OS. Use --force to try anyway."
+    fi
   fi
 
   mkdir -p "$OUT_DIR" || die "Unable to create directory $OUT_DIR"