Remove GCC checks
Clang is always used now, so we can remove all the GCC checks. Removing
GCC-specific configuration will happen in the next CL.
Test: m
Change-Id: I4835ecf6062159315d0dfb07b098e60bff033a8a
diff --git a/cc/linker.go b/cc/linker.go
index 9911b16..e3f1ff1 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -293,7 +293,7 @@
hod = "Device"
}
- if flags.Clang && linker.useClangLld(ctx) {
+ if linker.useClangLld(ctx) {
flags.LdFlags = append(flags.LdFlags, fmt.Sprintf("${config.%sGlobalLldflags}", hod))
if !BoolDefault(linker.MoreProperties.Pack_relocations, true) {
flags.LdFlags = append(flags.LdFlags, "-Wl,--pack-dyn-relocs=none")
@@ -310,12 +310,10 @@
flags.LdFlags = append(flags.LdFlags, "-Wl,--no-undefined")
}
- if flags.Clang && linker.useClangLld(ctx) {
+ if linker.useClangLld(ctx) {
flags.LdFlags = append(flags.LdFlags, toolchain.ClangLldflags())
- } else if flags.Clang {
- flags.LdFlags = append(flags.LdFlags, toolchain.ClangLdflags())
} else {
- flags.LdFlags = append(flags.LdFlags, toolchain.Ldflags())
+ flags.LdFlags = append(flags.LdFlags, toolchain.ClangLdflags())
}
if !ctx.toolchain().Bionic() {
@@ -362,11 +360,7 @@
flags.LdFlags = append(flags.LdFlags, "-Wl,--hash-style=both")
}
- if flags.Clang {
- flags.LdFlags = append(flags.LdFlags, toolchain.ToolchainClangLdflags())
- } else {
- flags.LdFlags = append(flags.LdFlags, toolchain.ToolchainLdflags())
- }
+ flags.LdFlags = append(flags.LdFlags, toolchain.ToolchainClangLdflags())
if Bool(linker.Properties.Group_static_libs) {
flags.GroupStaticLibs = true