ibmruntimes / v8-zos

The official mirror of the V8 git repository
https://chromium.googlesource.com/v8/v8.git
Other
1 stars 1 forks source link

gclient fails while installing sysroot on ppc/s390 #1

Closed jbajwa closed 8 years ago

jbajwa commented 8 years ago

gclient sync tries to download sysroot tarballs from googlestorage and perform an installation which are not present for ppc/s390 and therefore it fails. .. .. Downloading 1 files took 0.005829 second(s)

____ running '/usr/bin/python v8/build/linux/sysroot_scripts/install-sysroot.py --running-as-hook' in '/home/jbajwa/ppcle_v8' Unrecognized host arch: ppc64le Error: Command '/usr/bin/python v8/build/linux/sysroot_scripts/install-sysroot.py --running-as-hook' returned non-zero exit status 1 in /home/jbajwa/ppcle_v8

Proposed fix:

diff --git a/detect_host_arch.py b/detect_host_arch.py
index ccfbb6e..8d6a1ba 100755
--- a/detect_host_arch.py
+++ b/detect_host_arch.py
@@ -23,6 +23,11 @@ def HostArch():
     host_arch = 'arm'
   elif host_arch.startswith('mips'):
     host_arch = 'mips'
+  elif host_arch.startswith('ppc'):
+    host_arch = 'ppc'
+  elif host_arch.startswith('s390'):
+    host_arch = 's390'
+

   # platform.machine is based on running kernel. It's possible to use 64-bit
   # kernel with 32-bit userland, e.g. to give linker slightly more memory.
diff --git a/linux/sysroot_scripts/install-sysroot.py b/linux/sysroot_scripts/install-sysroot.py
index 2003ff6..77b2e56 100755
--- a/linux/sysroot_scripts/install-sysroot.py
+++ b/linux/sysroot_scripts/install-sysroot.py
@@ -82,6 +82,10 @@ def DetectHostArch():
     return 'arm'
   elif detected_host_arch == 'mips':
     return 'mips'
+  elif detected_host_arch == 'ppc':
+    return 'ppc'
+  elif detected_host_arch == 's390':
+    return 's390'

   raise Error('Unrecognized host arch: %s' % detected_host_arch)

@@ -141,7 +145,8 @@ def main(args):
   parser.add_option('--arch', type='choice', choices=valid_archs,
                     help='Sysroot architecture: %s' % ', '.join(valid_archs))
   options, _ = parser.parse_args(args)
-  if options.running_as_hook and not sys.platform.startswith('linux'):
+  host_arch = DetectHostArch()
+  if (options.running_as_hook and not sys.platform.startswith('linux')) or host_arch in ('ppc','s390'):
     return 0

   if options.running_as_hook:

jbajwa commented 8 years ago

https://codereview.chromium.org/2368943005/

jbajwa commented 8 years ago

https://codereview.chromium.org/2382883003