aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-04-04 12:58:03 -0700
committerElliott Hughes <enh@google.com>2016-04-04 12:58:03 -0700
commit852442957bf35e9dced80ec01d8a72da28743ea5 (patch)
treedb29c63b806efe593dac30f27f55af2fcc20b36c
parentd30e610ef24425596d1787755b6f952bb04b6c1d (diff)
downloadbuild_soong-852442957bf35e9dced80ec01d8a72da28743ea5.tar.gz
build_soong-852442957bf35e9dced80ec01d8a72da28743ea5.tar.bz2
build_soong-852442957bf35e9dced80ec01d8a72da28743ea5.zip
libm's headers have moved to live with their libc cousins.android-n-preview-2
(To reduce the need for this kind of thing in the various build systems.) Change-Id: I75d11497bbf42695f804bcc9ea9ba3b3a12ac764
-rw-r--r--cc/arm64_device.go2
-rw-r--r--cc/arm_device.go2
-rw-r--r--cc/cc.go1
-rw-r--r--cc/mips64_device.go2
-rw-r--r--cc/mips_device.go2
-rw-r--r--cc/x86_64_device.go2
-rw-r--r--cc/x86_device.go2
7 files changed, 0 insertions, 13 deletions
diff --git a/cc/arm64_device.go b/cc/arm64_device.go
index 284e5bd0..1a0408c6 100644
--- a/cc/arm64_device.go
+++ b/cc/arm64_device.go
@@ -103,8 +103,6 @@ func init() {
"-isystem ${LibcRoot}/include",
"-isystem ${LibcRoot}/kernel/uapi",
"-isystem ${LibcRoot}/kernel/uapi/asm-arm64",
- "-isystem ${LibmRoot}/include",
- "-isystem ${LibmRoot}/include/arm64",
}, " "))
pctx.StaticVariable("arm64ClangCflags", strings.Join(clangFilterUnknownCflags(arm64Cflags), " "))
diff --git a/cc/arm_device.go b/cc/arm_device.go
index c122664f..ea7db431 100644
--- a/cc/arm_device.go
+++ b/cc/arm_device.go
@@ -167,8 +167,6 @@ func init() {
"-isystem ${LibcRoot}/include",
"-isystem ${LibcRoot}/kernel/uapi",
"-isystem ${LibcRoot}/kernel/uapi/asm-arm",
- "-isystem ${LibmRoot}/include",
- "-isystem ${LibmRoot}/include/arm",
}, " "))
// Extended cflags
diff --git a/cc/cc.go b/cc/cc.go
index 3b3128f3..f3400e7c 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -65,7 +65,6 @@ var (
HostPrebuiltTag = pctx.VariableConfigMethod("HostPrebuiltTag", common.Config.PrebuiltOS)
LibcRoot = pctx.SourcePathVariable("LibcRoot", "bionic/libc")
- LibmRoot = pctx.SourcePathVariable("LibmRoot", "bionic/libm")
)
// Flags used by lots of devices. Putting them in package static variables will save bytes in
diff --git a/cc/mips64_device.go b/cc/mips64_device.go
index 65e6e267..8f85b47e 100644
--- a/cc/mips64_device.go
+++ b/cc/mips64_device.go
@@ -105,8 +105,6 @@ func init() {
"-isystem ${LibcRoot}/include",
"-isystem ${LibcRoot}/kernel/uapi",
"-isystem ${LibcRoot}/kernel/uapi/asm-mips",
- "-isystem ${LibmRoot}/include",
- "-isystem ${LibmRoot}/include/mips",
}, " "))
// Clang cflags
diff --git a/cc/mips_device.go b/cc/mips_device.go
index cd92eab1..ba67c0bb 100644
--- a/cc/mips_device.go
+++ b/cc/mips_device.go
@@ -137,8 +137,6 @@ func init() {
"-isystem ${LibcRoot}/include",
"-isystem ${LibcRoot}/kernel/uapi",
"-isystem ${LibcRoot}/kernel/uapi/asm-mips",
- "-isystem ${LibmRoot}/include",
- "-isystem ${LibmRoot}/include/mips",
}, " "))
// Clang cflags
diff --git a/cc/x86_64_device.go b/cc/x86_64_device.go
index dd8972d9..24c444e9 100644
--- a/cc/x86_64_device.go
+++ b/cc/x86_64_device.go
@@ -152,8 +152,6 @@ func init() {
"-isystem ${LibcRoot}/include",
"-isystem ${LibcRoot}/kernel/uapi",
"-isystem ${LibcRoot}/kernel/uapi/asm-x86",
- "-isystem ${LibmRoot}/include",
- "-isystem ${LibmRoot}/include/amd64",
}, " "))
// Clang cflags
diff --git a/cc/x86_device.go b/cc/x86_device.go
index 5ba442c6..92cae927 100644
--- a/cc/x86_device.go
+++ b/cc/x86_device.go
@@ -154,8 +154,6 @@ func init() {
"-isystem ${LibcRoot}/include",
"-isystem ${LibcRoot}/kernel/uapi",
"-isystem ${LibcRoot}/kernel/uapi/asm-x86",
- "-isystem ${LibmRoot}/include",
- "-isystem ${LibmRoot}/include/i387",
}, " "))
// Clang cflags