commit e91616105bc3e0285af3aac834d88ef44d2568fd
author Manoj Gupta <manojgupta@google.com> Mon Jul 01 17:37:46 2019 -0700
committer chrome-bot <chrome-bot@chromium.org> Tue Jul 02 21:03:42 2019 -0700
tree b5718f4ec3cd93745444462c65144b6146891254
parent 22bae0833130a0451abdb32bd37457c55c1b60d2

make_conf_util.sh: Do not set clang CC variables.

Post CL:1670087, clang is already the default compiler for SDK.
No need to explicitly force it here.

BUG=chromium:897978
TEST=sdk tryjob passes.

Change-Id: Ifc2b82d7050cfd2d029af7ec088a1952a7cfd7a1
Cq-Depend: chromium:1670087
Reviewed-on: https://chromium-review.googlesource.com/1684543
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Commit-Ready: Manoj Gupta <manojgupta@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

sdk_lib/make_conf_util.sh

diff --git a/sdk_lib/make_conf_util.sh b/sdk_lib/make_conf_util.sh
index e687dd3..6da7961 100644
--- a/sdk_lib/make_conf_util.sh
+++ b/sdk_lib/make_conf_util.sh
@@ -95,34 +95,15 @@
 # $1 - 'wget' for bootstrapping; 'curl' otherwise.
 # $2 - When outside the chroot, path to the chroot.  Empty when
 #      inside the chroot.
-# $3 - boolean indicating whether to set clang as default host
-#      compiler or not.
 _create_host_setup() {
   local fetchtype="$1"
   local host_setup="$2/etc/make.conf.host_setup"
-  local use_clang="$3"
-  local cc_string=""
-  local cxx_string=""
-  local build_cc_string=""
-  local build_cxx_string=""
-
-  if [[ "${use_clang}" == "true" ]];  then
-      cc_string='CC=${CHOST}-clang'
-      cxx_string='CXX=${CHOST}-clang++'
-      build_cc_string='BUILD_CC=${CHOST}-clang'
-      build_cxx_string='BUILD_CXX=${CHOST}-clang++'
-  fi
-
   ( echo "# Automatically generated.  EDIT THIS AND BE SORRY."
     echo
     _make_conf_fetchcommand "$fetchtype"
     _make_conf_private "$fetchtype"
     _make_conf_prebuilt
-    echo 'MAKEOPTS="-j'${NUM_JOBS}'"'
-    echo "${cc_string}"
-    echo "${cxx_string}"
-    echo "${build_cc_string}"
-    echo "${build_cxx_string}" ) | sudo_clobber "$host_setup"
+    echo 'MAKEOPTS="-j'${NUM_JOBS}'"' ) | sudo_clobber "$host_setup"
   sudo chmod 644 "$host_setup"
 }
 
@@ -134,11 +115,11 @@
 # Usage:
 #   $1 - Path to chroot as seen from outside
 create_bootstrap_host_setup() {
-  _create_host_setup wget "$@" "" ""
+  _create_host_setup wget "$@"
 }
 
 
 # Create /etc/make.conf.host_setup for normal usage.
 create_host_setup() {
-  _create_host_setup curl "" "true"
+  _create_host_setup curl ''
 }