diff options
author | 2016-05-24 13:58:18 +0000 | |
---|---|---|
committer | 2016-05-25 08:33:59 +0000 | |
commit | 9b820d7972dfe36ce73ef0f644a03b1996944ba6 (patch) | |
tree | cf5d903798142469cf8e891a2643f084206b2cee /src/main/java/com | |
parent | a5c2fa4018fdbfff7ce426d3780592eb2d17ce3f (diff) |
Remove the --cwarn command line option.
RELNOTES[INC]: The --cwarn command line option is not supported anymore. Use --copt instead.
--
MOS_MIGRATED_REVID=123101536
Diffstat (limited to 'src/main/java/com')
3 files changed, 0 insertions, 39 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java index 6a3db11b3c..08a1785e5d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java @@ -1327,10 +1327,6 @@ public class CppCompileAction extends AbstractAction addFilteredOptions(options, toolchain.getCxxOptions(features)); } - for (String warn : cppConfiguration.getCWarns()) { - options.add("-W" + warn); - } - // TODO(bazel-team): This needs to be before adding getUnfilteredCompilerOptions() and after // adding the warning flags until all toolchains are migrated; currently toolchains use the // unfiltered compiler options to inject include paths, which is superseded by the feature diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index 957851256d..7f07352cd7 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -1574,13 +1574,6 @@ public class CppConfiguration extends BuildConfiguration.Fragment { } /** - * Returns the extra warnings enabled for C compilation. - */ - public ImmutableList<String> getCWarns() { - return ImmutableList.copyOf(cppOptions.cWarns); - } - - /** * Returns true if mostly-static C++ binaries should be skipped. */ public boolean skipStaticOutputs() { diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java index c17373bd75..931db76d9a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java @@ -47,24 +47,6 @@ import java.util.Set; public class CppOptions extends FragmentOptions { /** - * Converter for --cwarn flag - */ - public static class GccWarnConverter implements Converter<String> { - @Override - public String convert(String input) throws OptionsParsingException { - if (input.startsWith("no-") || input.startsWith("-W")) { - throw new OptionsParsingException("Not a valid gcc warning to enable"); - } - return input; - } - - @Override - public String getTypeDescription() { - return "A gcc warning to enable"; - } - } - - /** * Converts a comma-separated list of compilation mode settings to a properly typed List. */ public static class FissionOptionConverter implements Converter<List<CompilationMode>> { @@ -312,16 +294,6 @@ public class CppOptions extends FragmentOptions { public List<String> coptList; @Option( - name = "cwarn", - converter = GccWarnConverter.class, - defaultValue = "", - category = "flags", - allowMultiple = true, - help = "Additional warnings to enable when compiling C or C++ source files." - ) - public List<String> cWarns; - - @Option( name = "cxxopt", defaultValue = "", category = "flags", |