From 61e2d4856dfb4a036b7c9111668353d057471eec Mon Sep 17 00:00:00 2001 From: Milad Farazmand <miladfar@ca.ibm.com> Date: Thu, 5 Dec 2019 22:52:51 -0500 Subject: [PATCH] tools: use CC instead of CXX when pointing to gcc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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> --- tools/make-v8.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/make-v8.sh b/tools/make-v8.sh index 1a6e175b6158cc..41c5ff76dbd641 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"'