Try to use cross toolchain on linux when needed

Getting /usr/i686-linux-gnu/lib in LD_LIBRARY_PATH when cross i6868

Signed-off-by: Yonggang Luo <[email protected]>

Author: lygstate

tools/build.py

@@ -27,6 +27,8 @@
 import re
 import os
 
+from distutils import spawn
+
 from common_py import path
 from common_py.system.filesystem import FileSystem as fs
 from common_py.system.executor import Executor as ex
@@ -411,12 +413,24 @@ def run_checktest(options):
         args.append('--quiet')
 
     fs.chdir(path.PROJECT_ROOT)
-    code = ex.run_cmd(cmd, args)
+    env = os.environ.copy()
+    if (options.target_tuple == 'i686-linux') and \
+        (options.host_tuple != options.target_tuple):
+        old = env.get("LD_LIBRARY_PATH")
+        if old:
+            env["LD_LIBRARY_PATH"] = old + ":/usr/i686-linux-gnu/lib"
+        else:
+            env["LD_LIBRARY_PATH"] = "/usr/i686-linux-gnu/lib"
+        if spawn.find_executable('i686-linux-gnu-gcc'):
+            env['CC'] = 'i686-linux-gnu-gcc'
+            env['CXX'] = 'i686-linux-gnu-g++'
+
+    code = ex.run_cmd(cmd, args, env=env)
     if code != 0:
         ex.fail('Failed to pass unit tests')
 
     if not options.no_check_valgrind:
-        code = ex.run_cmd(cmd, ['--valgrind'] + args)
+        code = ex.run_cmd(cmd, ['--valgrind'] + args, env=env)
         if code != 0:
             ex.fail('Failed to pass unit tests in valgrind environment')
 

tools/common_py/system/executor.py

@@ -60,11 +60,11 @@ def fail(msg):
         exit(1)
 
     @staticmethod
-    def run_cmd(cmd, args=[], quiet=False, cwd=None):
+    def run_cmd(cmd, args=[], quiet=False, cwd=None, env=None):
         if not quiet:
             Executor.print_cmd_line(cmd, args)
         try:
-            return subprocess.call([cmd] + args, cwd=cwd)
+            return subprocess.call([cmd] + args, cwd=cwd, env=env)
         except OSError as e:
             Executor.fail("[Failed - %s] %s" % (cmd, e.strerror))
 

tools/testrunner.py

@@ -158,6 +158,7 @@ def __init__(self, options):
         # Process the iotjs build information.
         iotjs_output = Executor.check_run_cmd_output(self.iotjs,
                                                      [path.BUILD_INFO_PATH])
+        print("IoT.js build info:" + iotjs_output.decode('utf8', 'ignore'))
         build_info = json.loads(iotjs_output)
 
         self.builtins = set(build_info["builtins"])
@@ -180,7 +181,13 @@ def build_napi_test_module(self):
         cmd = ['--debug'] if self.debug else ['--release']
         if self.platform == 'windows':
             node_gyp += '.cmd'
-            cmd.append('--arch=x64' if self.arch == 'x64' else '--arch=ia32')
+        if self.arch == 'x64':
+            cmd.append('--arch=x64')
+        elif self.arch == 'ia32':
+            cmd.append('--arch=ia32')
+        elif self.arch:
+            raise Exception(self.arch + " not supported")
+
         Executor.check_run_cmd(node_gyp, ['rebuild'] + cmd,
                                cwd=project_root)