From bef00a2c525333733806d274f9f6f9223a85712b Mon Sep 17 00:00:00 2001
From: Logan Chien <loganchien@google.com>
Date: Fri, 27 Jul 2018 06:27:53 +0800
Subject: [PATCH] Remove LinuxClangCppflags

This commit removes LinuxClangCppflags.  Adding these `-isystem` flags
results in build failures when we build a module with `libc++_host`.
Furthermore, these headers are not being used anymore.

Bug: 111579848
Test: make checkbuild  # on aosp and internal
Change-Id: Ideca268431d9d60d383e3e5b7bb3f73ece416bd2
---
 cc/config/x86_linux_host.go | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/cc/config/x86_linux_host.go b/cc/config/x86_linux_host.go
index 354500eb0..3965cd7a4 100644
--- a/cc/config/x86_linux_host.go
+++ b/cc/config/x86_linux_host.go
@@ -96,19 +96,6 @@ var (
 
 	linuxX8664ClangLldflags = ClangFilterUnknownLldflags(linuxX8664ClangLdflags)
 
-	linuxClangCppflags = []string{
-		"-isystem ${LinuxGccRoot}/${LinuxGccTriple}/include/c++/${LinuxGccVersion}",
-		"-isystem ${LinuxGccRoot}/${LinuxGccTriple}/include/c++/${LinuxGccVersion}/backward",
-	}
-
-	linuxX86ClangCppflags = []string{
-		"-isystem ${LinuxGccRoot}/${LinuxGccTriple}/include/c++/${LinuxGccVersion}/${LinuxGccTriple}/32",
-	}
-
-	linuxX8664ClangCppflags = []string{
-		"-isystem ${LinuxGccRoot}/${LinuxGccTriple}/include/c++/${LinuxGccVersion}/${LinuxGccTriple}",
-	}
-
 	linuxAvailableLibraries = addPrefix([]string{
 		"c",
 		"dl",
@@ -141,7 +128,6 @@ func init() {
 	pctx.StaticVariable("LinuxClangCflags", strings.Join(linuxClangCflags, " "))
 	pctx.StaticVariable("LinuxClangLdflags", strings.Join(linuxClangLdflags, " "))
 	pctx.StaticVariable("LinuxClangLldflags", strings.Join(linuxClangLldflags, " "))
-	pctx.StaticVariable("LinuxClangCppflags", strings.Join(linuxClangCppflags, " "))
 
 	// Extended cflags
 	pctx.StaticVariable("LinuxX86Cflags", strings.Join(linuxX86Cflags, " "))
@@ -157,8 +143,6 @@ func init() {
 	pctx.StaticVariable("LinuxX86ClangLldflags", strings.Join(linuxX86ClangLldflags, " "))
 	pctx.StaticVariable("LinuxX8664ClangLdflags", strings.Join(linuxX8664ClangLdflags, " "))
 	pctx.StaticVariable("LinuxX8664ClangLldflags", strings.Join(linuxX8664ClangLldflags, " "))
-	pctx.StaticVariable("LinuxX86ClangCppflags", strings.Join(linuxX86ClangCppflags, " "))
-	pctx.StaticVariable("LinuxX8664ClangCppflags", strings.Join(linuxX8664ClangCppflags, " "))
 	// Yasm flags
 	pctx.StaticVariable("LinuxX86YasmFlags", "-f elf32 -m x86")
 	pctx.StaticVariable("LinuxX8664YasmFlags", "-f elf64 -m amd64")
@@ -231,7 +215,7 @@ func (t *toolchainLinuxX86) ClangCflags() string {
 }
 
 func (t *toolchainLinuxX86) ClangCppflags() string {
-	return "${config.LinuxClangCppflags} ${config.LinuxX86ClangCppflags}"
+	return ""
 }
 
 func (t *toolchainLinuxX8664) ClangTriple() string {
@@ -243,7 +227,7 @@ func (t *toolchainLinuxX8664) ClangCflags() string {
 }
 
 func (t *toolchainLinuxX8664) ClangCppflags() string {
-	return "${config.LinuxClangCppflags} ${config.LinuxX8664ClangCppflags}"
+	return ""
 }
 
 func (t *toolchainLinuxX86) ClangLdflags() string {