Fix cross compilation tests.

2 files changed, 11 insertions, 9 deletions

diff --git a/test cases/common/59 object generator/meson.build b/test cases/common/59 object generator/meson.build
index 04d7d8b08..d2c8afb6c 100644
--- a/test cases/common/59 object generator/meson.build
+++ b/test cases/common/59 object generator/meson.build
@@ -12,10 +12,11 @@ else
   outputname = '@BASENAME@.o'
 endif
 
-# Generate a header file that needs to be included.
+cc = meson.get_compiler('c').cmd_array().get(0-1)
+# Generate an object file manually.
 gen = generator(python,
  output : outputname,
- arguments : [comp, '@INPUT@', '@OUTPUT@'])
+ arguments : [comp, cc, '@INPUT@', '@OUTPUT@'])
 
 generated = gen.process('source.c')
 
diff --git a/test cases/common/59 object generator/obj_generator.py b/test cases/common/59 object generator/obj_generator.py
index f64484342..6f98f3986 100755
--- a/test cases/common/59 object generator/obj_generator.py
+++ b/test cases/common/59 object generator/obj_generator.py
@@ -5,14 +5,15 @@
 import sys, shutil, subprocess
 
 if __name__ == '__main__':
-    if len(sys.argv) != 3:
-        print(sys.argv[0], 'input_file output_file')
+    if len(sys.argv) != 4:
+        print(sys.argv[0], 'compiler input_file output_file')
         sys.exit(1)
-    ifile = sys.argv[1]
-    ofile = sys.argv[2]
-    if shutil.which('cl'):
-        cmd = ['cl', '/nologo', '/Fo'+ofile, '/c', ifile]
+    compiler = sys.argv[1]
+    ifile = sys.argv[2]
+    ofile = sys.argv[3]
+    if compiler.endswith('cl'):
+        cmd = [compiler, '/nologo', '/Fo'+ofile, '/c', ifile]
     else:
-        cmd = ['cc', '-c', ifile, '-o', ofile]
+        cmd = [compiler, '-c', ifile, '-o', ofile]
     sys.exit(subprocess.call(cmd))