diff options
author | 2018-03-28 11:14:13 -0700 | |
---|---|---|
committer | 2018-03-28 11:15:32 -0700 | |
commit | 460e0cf2260dbe227a89ad53dd39cbcfb22a4016 (patch) | |
tree | 1fcc3b7c79f450c257ab9cad1b9d0e184a4c4714 /src/main/java/com/google/devtools/build/lib/rules/apple | |
parent | 82cfb5582d0f33eb0703b77b32dcf2dd080c07d4 (diff) |
Remove `--swift_whole_module_optimization` flag.
Users should instead pass `--swiftcopt=-whole-module-optimization`, which has the same effect.
PiperOrigin-RevId: 190800123
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/apple')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java | 9 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java | 16 |
2 files changed, 2 insertions, 23 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java index 35ddd09a68..a623c8634d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java @@ -33,13 +33,4 @@ public class SwiftCommandLineOptions extends FragmentOptions { help = "Additional options to pass to Swift compilation." ) public List<String> copts; - - @Option( - name = "swift_whole_module_optimization", - defaultValue = "false", - documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, - help = "Whether to enable Whole Module Optimization" - ) - public boolean enableWholeModuleOptimization; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java index 5794bcd558..60e771aabd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftConfiguration.java @@ -40,29 +40,17 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; ) @Immutable public class SwiftConfiguration extends BuildConfiguration.Fragment { - private final boolean enableWholeModuleOptimization; private final ImmutableList<String> copts; public SwiftConfiguration(SwiftCommandLineOptions options) { - this(options.enableWholeModuleOptimization, ImmutableList.copyOf(options.copts)); + this(ImmutableList.copyOf(options.copts)); } @AutoCodec.Instantiator - SwiftConfiguration(boolean enableWholeModuleOptimization, ImmutableList<String> copts) { - this.enableWholeModuleOptimization = enableWholeModuleOptimization; + SwiftConfiguration(ImmutableList<String> copts) { this.copts = copts; } - /** Returns whether to enable Whole Module Optimization. */ - @SkylarkCallable( - name = "enable_whole_module_optimization", - doc = "<code>True</code> if <em>whole module optimization</em> should be enabled when " - + "compiling Swift code; otherwise, <code>False</code>." - ) - public boolean enableWholeModuleOptimization() { - return enableWholeModuleOptimization; - } - /** Returns a list of options to use for compiling Swift. */ @SkylarkCallable( name = "copts", |