Commit d38b985
tools: fix v8 testing with devtoolset on ppcle
The devtoolset doesn't use or set the CXX, etc, env vars, so ignore them
if not present.
PR-URL: #28458
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>1 parent eee66c5 commit d38b985
1 file changed
Lines changed: 7 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,7 +12,9 @@ if [[ "$ARCH" == "s390x" ]] || [[ "$ARCH" == "ppc64le" ]]; then | |||
| 12 | 12 | export BUILD_TOOLS=/home/iojs/build-tools | |
| 13 | 13 | export LD_LIBRARY_PATH=$BUILD_TOOLS:$LD_LIBRARY_PATH | |
| 14 | 14 | export PATH=$BUILD_TOOLS:$PATH | |
| 15 | - CXX_PATH=`which $CXX |grep g++` | ||
| 15 | + if [[ X"$CXX" != X ]]; then | ||
| 16 | + CXX_PATH=`which $CXX |grep g++` | ||
| 17 | + fi | ||
| 16 | 18 | rm -f "$BUILD_TOOLS/g++" | |
| 17 | 19 | rm -f "$BUILD_TOOLS/gcc" | |
| 18 | 20 | fi | |
@@ -24,8 +26,10 @@ if [[ "$ARCH" == "s390x" ]]; then | |||
| 24 | 26 | 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"' | |
| 25 | 27 | ninja -v -C out.gn/$BUILD_ARCH_TYPE d8 cctest inspector-test | |
| 26 | 28 | elif [[ "$ARCH" == "ppc64le" ]]; then | |
| 27 | - ln -s /usr/bin/$CXX "$BUILD_TOOLS/g++" | ||
| 28 | - ln -s /usr/bin/$CC "$BUILD_TOOLS/gcc" | ||
| 29 | + if [[ X"$CXX" != X ]]; then | ||
| 30 | + ln -s /usr/bin/$CXX "$BUILD_TOOLS/g++" | ||
| 31 | + ln -s /usr/bin/$CC "$BUILD_TOOLS/gcc" | ||
| 32 | + fi | ||
| 29 | 33 | g++ --version | |
| 30 | 34 | export PKG_CONFIG_PATH=$BUILD_TOOLS/pkg-config-files | |
| 31 | 35 | gn gen 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="ppc64" target_cpu="ppc64"' | |
0 commit comments