diff options
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java index ed4dafc5b9..161d8c9b40 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/ArmCrosstools.java @@ -143,7 +143,7 @@ class ArmCrosstools { .setToolchainIdentifier("aarch64-linux-android-clang" + clangVersion) .setTargetSystemName("aarch64-linux-android") .setTargetCpu("arm64-v8a") - .setCompiler("gcc-4.9-clang" + clangVersion) + .setCompiler("clang" + clangVersion) .addAllToolPath(ndkPaths.createClangToolpaths(toolchainName, targetPlatform, clangVersion)) @@ -388,7 +388,7 @@ class ArmCrosstools { CToolchain.Builder builder = CToolchain.newBuilder() .setTargetSystemName("arm-linux-androideabi") - .setCompiler("gcc-4.8-clang" + clangVersion) + .setCompiler("clang" + clangVersion) .addAllToolPath(ndkPaths.createClangToolpaths( toolchainName, diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java index a18acffbec..0692e76eb0 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/MipsCrosstools.java @@ -194,7 +194,7 @@ class MipsCrosstools { String llvmTriple = mipsArch + "-none-linux-android"; return CToolchain.newBuilder() - .setCompiler("gcc-" + gccVersion + "-clang" + clangVersion) + .setCompiler("clang" + clangVersion) // Compiler flags .addCompilerFlag("-gcc-toolchain") diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java index 79a7b21e87..6920d32b96 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/X86Crosstools.java @@ -184,7 +184,7 @@ class X86Crosstools { String llvmTriple = llvmArch + "-none-linux-android"; return CToolchain.newBuilder() - .setCompiler("gcc-" + gccVersion + "-clang" + clangVersion) + .setCompiler("clang" + clangVersion) // Compiler flags .addCompilerFlag("-gcc-toolchain") |