diff options
author | Refael Ackermann <refack@gmail.com> | 2018-10-23 16:51:42 -0400 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2018-11-09 16:13:46 -0800 |
commit | d0e593e11ec2c1f4f67e3175f5c88cca0f945a94 (patch) | |
tree | 7f8c66784753709271643f3033b724179c2186f4 /tools/make-v8.sh | |
parent | e492f92ec5a89f6cfd3da7fdb9db14c8d2cf9d0a (diff) | |
download | android-node-v8-d0e593e11ec2c1f4f67e3175f5c88cca0f945a94.tar.gz android-node-v8-d0e593e11ec2c1f4f67e3175f5c88cca0f945a94.tar.bz2 android-node-v8-d0e593e11ec2c1f4f67e3175f5c88cca0f945a94.zip |
build,tools: update make-v8.sh for s390x
PR-URL: https://github.com/nodejs/node/pull/23839
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'tools/make-v8.sh')
-rwxr-xr-x | tools/make-v8.sh | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/tools/make-v8.sh b/tools/make-v8.sh index 4365412856..1bbf472aae 100755 --- a/tools/make-v8.sh +++ b/tools/make-v8.sh @@ -1,9 +1,27 @@ -#!/bin/bash +#!/bin/bash -xe BUILD_ARCH_TYPE=$1 V8_BUILD_OPTIONS=$2 cd deps/v8 tools/node/fetch_deps.py . -PATH=~/_depot_tools:$PATH tools/dev/v8gen.py $BUILD_ARCH_TYPE --no-goma $V8_BUILD_OPTIONS -PATH=~/_depot_tools:$PATH ninja -C out.gn/$BUILD_ARCH_TYPE/ d8 cctest inspector-test + +if [ "`arch`" == "s390x" ] +then + # set paths manually for now to use locally installed gn + export BUILD_TOOLS=/home/iojs/build-tools + export LD_LIBRARY_PATH=$BUILD_TOOLS:$LD_LIBRARY_PATH + export PATH=$BUILD_TOOLS:$PATH + CXX_PATH=`which $CXX |grep g++` + rm -f "$BUILD_TOOLS/g++" + rm -f "$BUILD_TOOLS/gcc" + ln -s $CXX_PATH "$BUILD_TOOLS/g++" + ln -s $CXX_PATH "$BUILD_TOOLS/gcc" + g++ --version + export PKG_CONFIG_PATH=$BUILD_TOOLS/pkg-config + gn gen -v out.gn/$BUILD_ARCH_TYPE --args='is_component_build=false is_debug=false use_goma=false goma_dir="None" use_custom_libcxx=false v8_target_cpu="s390x" target_cpu="s390x"' + ninja -v -C out.gn/$BUILD_ARCH_TYPE d8 cctest inspector-test +else + PATH=~/_depot_tools:$PATH tools/dev/v8gen.py $BUILD_ARCH_TYPE --no-goma $V8_BUILD_OPTIONS + PATH=~/_depot_tools:$PATH ninja -C out.gn/$BUILD_ARCH_TYPE/ d8 cctest inspector-test +fi |