diff options
| author | Milad Farazmand <miladfar@ca.ibm.com> | 2019-12-05 22:52:51 -0500 |
|---|---|---|
| committer | Richard Lau <riclau@uk.ibm.com> | 2019-12-07 00:45:51 -0500 |
| commit | cf5ce2c9e1aab5eadbae107c697fdd11c6fb93a9 (patch) | |
| tree | 6161d4622fc829c613922e8570d69864c136408c | |
| parent | 7ab21b2f5702ae0b2a5fe5d30ec356f83a95f698 (diff) | |
| download | android-node-v8-cf5ce2c9e1aab5eadbae107c697fdd11c6fb93a9.tar.gz android-node-v8-cf5ce2c9e1aab5eadbae107c697fdd11c6fb93a9.tar.bz2 android-node-v8-cf5ce2c9e1aab5eadbae107c697fdd11c6fb93a9.zip | |
tools: use CC instead of CXX when pointing to gcc
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>
| -rwxr-xr-x | tools/make-v8.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/make-v8.sh b/tools/make-v8.sh index 1a6e175b61..41c5ff76db 100755 --- a/tools/make-v8.sh +++ b/tools/make-v8.sh @@ -15,12 +15,15 @@ if [[ "$ARCH" == "s390x" ]] || [[ "$ARCH" == "ppc64le" ]]; then if [[ X"$CXX" != X ]]; then CXX_PATH=`which $CXX |grep g++` fi + if [[ X"$CC" != X ]]; then + CC_PATH=`which $CC |grep gcc` + fi rm -f "$BUILD_TOOLS/g++" rm -f "$BUILD_TOOLS/gcc" fi if [[ "$ARCH" == "s390x" ]]; then ln -s $CXX_PATH "$BUILD_TOOLS/g++" - ln -s $CXX_PATH "$BUILD_TOOLS/gcc" + ln -s $CC_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"' |