diff options
| author | Michael Dawson <michael_dawson@ca.ibm.com> | 2016-03-28 17:03:06 -0400 |
|---|---|---|
| committer | Michael Dawson <michael_dawson@ca.ibm.com> | 2016-03-29 18:52:48 -0400 |
| commit | a4c4a852a9a0ead7db424d72da056a5164da1179 (patch) | |
| tree | 3a28f0b0047169838eef35f9bbea30392048308b /Makefile | |
| parent | 82fdaae901b06f25c869f2c1cfe71ae2b57299d0 (diff) | |
| download | android-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 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -340,12 +340,20 @@ else ifeq ($(DESTCPU),ppc) ARCH=ppc else +ifeq ($(DESTCPU),s390) +ARCH=s390 +else +ifeq ($(DESTCPU),s390x) +ARCH=s390x +else ARCH=x86 endif endif endif endif endif +endif +endif # node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32'). # pass the proper v8 arch name to $V8_ARCH based on user-specified $DESTCPU. |