unittests: Fix test_identity_cross on Solaris

Since mesonbuild/environment.py doesn't recognize Studio compilers,
force use of gcc on Solaris for now.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
pull/7370/head
Alan Coopersmith 5 years ago
parent 77935db7b0
commit f71c828d99
  1. 10
      test cases/unit/61 identity cross/build_wrapper.py
  2. 10
      test cases/unit/61 identity cross/host_wrapper.py

@ -1,5 +1,11 @@
#!/usr/bin/env python3
import subprocess, sys
import subprocess, sys, platform
subprocess.call(["cc", "-DEXTERNAL_BUILD"] + sys.argv[1:])
# Meson does not yet support Studio cc on Solaris, only gcc or clang
if platform.system() == 'SunOS':
cc = 'gcc'
else:
cc = 'cc'
subprocess.call([cc, "-DEXTERNAL_BUILD"] + sys.argv[1:])

@ -1,5 +1,11 @@
#!/usr/bin/env python3
import subprocess, sys
import subprocess, sys, platform
subprocess.call(["cc", "-DEXTERNAL_HOST"] + sys.argv[1:])
# Meson does not yet support Studio cc on Solaris, only gcc or clang
if platform.system() == 'SunOS':
cc = 'gcc'
else:
cc = 'cc'
subprocess.call([cc, "-DEXTERNAL_HOST"] + sys.argv[1:])

Loading…
Cancel
Save