From 2e61c6327c6a7482153a71bf8342f01b204544a6 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 1/2] 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
---
 tools/make-v8.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/make-v8.sh b/tools/make-v8.sh
index 1a6e175b6158cc..cc77356d883a2b 100755
--- a/tools/make-v8.sh
+++ b/tools/make-v8.sh
@@ -20,7 +20,7 @@ if [[ "$ARCH" == "s390x" ]] || [[ "$ARCH" == "ppc64le" ]]; then
 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"'

From 3d7c777743fcac206f25189837449ebc51b49111 Mon Sep 17 00:00:00 2001
From: Milad Farazmand <miladfar@ca.ibm.com>
Date: Thu, 5 Dec 2019 23:26:31 -0500
Subject: [PATCH 2/2] defining CC_PATH

---
 tools/make-v8.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/make-v8.sh b/tools/make-v8.sh
index cc77356d883a2b..41c5ff76dbd641 100755
--- a/tools/make-v8.sh
+++ b/tools/make-v8.sh
@@ -15,6 +15,9 @@ 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