Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d38b985

Browse filesBrowse files
sam-githubtargos
authored andcommitted
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
Copy full SHA for d38b985

File tree

Expand file treeCollapse file tree

1 file changed

+7
-3
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+7
-3
lines changed
Open diff view settings
Collapse file

‎tools/make-v8.sh‎

Copy file name to clipboardExpand all lines: tools/make-v8.sh
+7-3Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ if [[ "$ARCH" == "s390x" ]] || [[ "$ARCH" == "ppc64le" ]]; then
1212
export BUILD_TOOLS=/home/iojs/build-tools
1313
export LD_LIBRARY_PATH=$BUILD_TOOLS:$LD_LIBRARY_PATH
1414
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
1618
rm -f "$BUILD_TOOLS/g++"
1719
rm -f "$BUILD_TOOLS/gcc"
1820
fi
@@ -24,8 +26,10 @@ if [[ "$ARCH" == "s390x" ]]; then
2426
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"'
2527
ninja -v -C out.gn/$BUILD_ARCH_TYPE d8 cctest inspector-test
2628
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
2933
g++ --version
3034
export PKG_CONFIG_PATH=$BUILD_TOOLS/pkg-config-files
3135
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

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.