Bug 894763 - Default objdir should reflect target, not host. r=gps

build/autoconf/mozconfig2client-mk

@@ -19,7 +19,17 @@ EOF
 }
 
 ac_add_options() {
-  echo "# $* is used by configure (not client.mk)"
+  for _opt
+  do
+    case "$_opt" in
+    --target=*)
+      echo $_opt | sed s/--target/CONFIG_GUESS/
+      ;;
+    *)
+      echo "# $_opt is used by configure (not client.mk)"
+      ;;
+    esac
+  done
 }
 
 ac_add_app_options() {

python/mozbuild/mozbuild/base.py

@@ -282,6 +282,10 @@ class MozbuildObject(ProcessExecutionMixin):
 
     @property
     def _config_guess(self):
+        if self._config_guess_output is None:
+            make_extra = dict(m.split('=', 1) for m in self.mozconfig['make_extra'])
+            self._config_guess_output = make_extra.get('CONFIG_GUESS', None)
+
         if self._config_guess_output is None:
             p = os.path.join(self.topsrcdir, 'build', 'autoconf',
                 'config.guess')

python/mozbuild/mozbuild/mozconfig_loader

@@ -12,6 +12,13 @@ set -e
 ac_add_options() {
   local opt
   for opt; do
+    case "$opt" in
+    --target=*)
+      echo "------BEGIN_MK_OPTION"
+      echo $opt | sed s/--target/CONFIG_GUESS/
+      echo "------END_MK_OPTION"
+      ;;
+    esac
     echo "------BEGIN_AC_OPTION"
     echo $opt
     echo "------END_AC_OPTION"