summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMichael Dawson <michael_dawson@ca.ibm.com>2016-03-28 17:03:06 -0400
committerMichael Dawson <michael_dawson@ca.ibm.com>2016-03-29 18:52:48 -0400
commita4c4a852a9a0ead7db424d72da056a5164da1179 (patch)
tree3a28f0b0047169838eef35f9bbea30392048308b /tools
parent82fdaae901b06f25c869f2c1cfe71ae2b57299d0 (diff)
downloadandroid-node-v8-a4c4a852a9a0ead7db424d72da056a5164da1179.tar.gz
android-node-v8-a4c4a852a9a0ead7db424d72da056a5164da1179.tar.bz2
android-node-v8-a4c4a852a9a0ead7db424d72da056a5164da1179.zip
build: enable compilation for linuxOne
Changes to Node core in order to allow compilation for linuxOne. The ../archs/linux32-s390x/opensslconf.h and ../archs/linux64-s390x/opensslconf.h were automatically generated by running make linux-ppc linux-ppc64 in the deps/openssl/config directory as per our standard practice After these changes we still need a version of v8 which supports linuxOne but that will be coming soon in the 5.1 version of v8. Until then with these changes we'll be able to create a hybrid build which pulls in v8 from the http://github/andrewlow repo. PR-URL: https://github.com/nodejs/node/pull/5941 Reviewed-By: Johan Bergström <bugs@bergstroem.nu> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/test.py3
-rw-r--r--tools/utils.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/test.py b/tools/test.py
index 1c10c624f7..9b5dcd735f 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -773,7 +773,8 @@ TIMEOUT_SCALEFACTOR = {
'armv6' : { 'debug' : 12, 'release' : 3 }, # The ARM buildbots are slow.
'arm' : { 'debug' : 8, 'release' : 2 },
'ia32' : { 'debug' : 4, 'release' : 1 },
- 'ppc' : { 'debug' : 4, 'release' : 1 } }
+ 'ppc' : { 'debug' : 4, 'release' : 1 },
+ 's390' : { 'debug' : 4, 'release' : 1 } }
class Context(object):
diff --git a/tools/utils.py b/tools/utils.py
index c77ab8edaf..dd5ce3fcb6 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -89,6 +89,8 @@ def GuessArchitecture():
return 'ia32'
elif id.startswith('ppc'):
return 'ppc'
+ elif id == 's390x':
+ return 's390'
else:
id = platform.processor()
if id == 'powerpc':