Nodejs/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-11-21 10:59:27 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

tools: use CC instead of CXX when pointing to gcc

Browse Source 
Current CC flag points to g++ instead of gcc which is causing failures
when compiling V8.

PR-URL: https://github.com/nodejs/node/pull/30817
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Milad Farazmand 2019-12-05 22:52:51 -05:00 committed by Richard Lau
parent 7ab21b2f57
commit cf5ce2c9e1
No known key found for this signature in database
GPG Key ID: C43CEC45C17AB93C
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/make-v8.sh
View File

@ -15,12 +15,15 @@ if [[ "$ARCH" == "s390x" ]] || [[ "$ARCH" == "ppc64le" ]]; then
if [[ X"$CXX" != X ]]; then if [[ X"$CXX" != X ]]; then
CXX_PATH=`which $CXX |grep g++` CXX_PATH=`which $CXX |grep g++`
fi fi
if [[ X"$CC" != X ]]; then
CC_PATH=`which $CC |grep gcc`
fi
rm -f "$BUILD_TOOLS/g++" rm -f "$BUILD_TOOLS/g++"
rm -f "$BUILD_TOOLS/gcc" rm -f "$BUILD_TOOLS/gcc"
fi fi
if [[ "$ARCH" == "s390x" ]]; then if [[ "$ARCH" == "s390x" ]]; then
ln -s $CXX_PATH "$BUILD_TOOLS/g++" ln -s $CXX_PATH "$BUILD_TOOLS/g++"
ln -s $CXX_PATH "$BUILD_TOOLS/gcc" ln -s $CC_PATH "$BUILD_TOOLS/gcc"
g++ --version g++ --version
export PKG_CONFIG_PATH=$BUILD_TOOLS/pkg-config 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"' 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"'