From 16f10837a224df9d792cba563dbee138a0789cb7 Mon Sep 17 00:00:00 2001 From: Steven Dee Date: Thu, 22 Oct 2015 08:00:53 +0000 Subject: Add missing dash for -finline-limit=300 -- Change-Id: Ic19a8292e1c57623085daa6ce3cbf280cdf7129e Reviewed-on: https://bazel-review.googlesource.com/2180 MOS_MIGRATED_REVID=106035838 --- .../rules/android/ndkcrosstools/X86Crosstools.java | 38 ++++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-) 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 f3caab34bb..79a7b21e87 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 @@ -149,28 +149,30 @@ class X86Crosstools { .addCompilerFlag("-ffunction-sections") .addCompilerFlag("-funwind-tables") .addCompilerFlag("-no-canonical-prefixes") - + // Linker flags .addLinkerFlag("-no-canonical-prefixes") - + // Additional release flags - .addCompilationModeFlags(CompilationModeFlags.newBuilder() - .setMode(CompilationMode.OPT) - .addCompilerFlag("-O2") - .addCompilerFlag("-g") - .addCompilerFlag("-DNDEBUG") - .addCompilerFlag("-fomit-frame-pointer") - .addCompilerFlag("-fstrict-aliasing") - .addCompilerFlag("-funswitch-loops") - .addCompilerFlag("finline-limit=300")) - + .addCompilationModeFlags( + CompilationModeFlags.newBuilder() + .setMode(CompilationMode.OPT) + .addCompilerFlag("-O2") + .addCompilerFlag("-g") + .addCompilerFlag("-DNDEBUG") + .addCompilerFlag("-fomit-frame-pointer") + .addCompilerFlag("-fstrict-aliasing") + .addCompilerFlag("-funswitch-loops") + .addCompilerFlag("-finline-limit=300")) + // Additional debug flags - .addCompilationModeFlags(CompilationModeFlags.newBuilder() - .setMode(CompilationMode.DBG) - .addCompilerFlag("-O0") - .addCompilerFlag("-g") - .addCompilerFlag("-fno-omit-frame-pointer") - .addCompilerFlag("-fno-strict-aliasing")); + .addCompilationModeFlags( + CompilationModeFlags.newBuilder() + .setMode(CompilationMode.DBG) + .addCompilerFlag("-O0") + .addCompilerFlag("-g") + .addCompilerFlag("-fno-omit-frame-pointer") + .addCompilerFlag("-fno-strict-aliasing")); } private CToolchain.Builder createBaseX86ClangToolchain( -- cgit v1.2.3