Introduce -c source_file -o output_file build variables
Prior to this cl CompileCommandLine would (almost) unconditionally emit -c and
-o flags. This cl removes this logic and relies on crosstool to emit these
flags. This is another small step towards platform independent C++ rules.
Memory use is not affected, since the build variables used by this cl are already
exposed, this cl just forces crosstools to use it.
Encore of https://github.com/bazelbuild/bazel/commit/f26e8694ae78599b3e2004e3360eaf3443fa53a6.
RELNOTES: None.
PiperOrigin-RevId: 184981106
diff --git a/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java b/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java
index e8d5a93..1ac7da8 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/CommandAction.java
@@ -14,6 +14,7 @@
package com.google.devtools.build.lib.actions;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableMap;
import java.util.List;
@@ -33,5 +34,6 @@
ImmutableMap<String, String> getEnvironment();
/** Returns inputs to this action, including inputs that may be pruned. */
+ @VisibleForTesting // productionVisibility = Visibility.PRIVATE
Iterable<Artifact> getPossibleInputsForTesting();
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index 8d599be..fa2c96e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -119,7 +119,6 @@
private static final ImmutableSet<String> DEFAULT_FEATURES =
ImmutableSet.of(
CppRuleClasses.DEPENDENCY_FILE,
- CppRuleClasses.COMPILE_ACTION_FLAGS_IN_FLAG_SET,
CppRuleClasses.RANDOM_SEED,
CppRuleClasses.MODULE_MAPS,
CppRuleClasses.MODULE_MAP_HOME_CWD,
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java
index 5f2a3d8..7eef57f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLine.java
@@ -24,7 +24,6 @@
import com.google.devtools.build.lib.skyframe.serialization.InjectingObjectCodec;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
-import com.google.devtools.build.lib.util.FileType;
import com.google.devtools.build.lib.util.Pair;
import com.google.devtools.build.lib.vfs.FileSystemProvider;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -40,7 +39,6 @@
new CompileCommandLine_AutoCodec();
private final Artifact sourceFile;
- private final Artifact outputFile;
private final CoptsFilter coptsFilter;
private final FeatureConfiguration featureConfiguration;
private final PathFragment crosstoolTopPathFragment;
@@ -52,7 +50,6 @@
@VisibleForSerialization
CompileCommandLine(
Artifact sourceFile,
- Artifact outputFile,
CoptsFilter coptsFilter,
FeatureConfiguration featureConfiguration,
PathFragment crosstoolTopPathFragment,
@@ -60,7 +57,6 @@
String actionName,
DotdFile dotdFile) {
this.sourceFile = Preconditions.checkNotNull(sourceFile);
- this.outputFile = Preconditions.checkNotNull(outputFile);
this.coptsFilter = coptsFilter;
this.featureConfiguration = Preconditions.checkNotNull(featureConfiguration);
this.crosstoolTopPathFragment = crosstoolTopPathFragment;
@@ -80,8 +76,12 @@
return featureConfiguration.getEnvironmentVariables(actionName, variables);
}
- protected List<String> getArgv(
- PathFragment outputFile, CcToolchainFeatures.Variables overwrittenVariables) {
+ /**
+ * @param overwrittenVariables: Variables that will overwrite original build variables. When null,
+ * unmodified original variables are used.
+ */
+ protected List<String> getArguments(
+ @Nullable CcToolchainFeatures.Variables overwrittenVariables) {
List<String> commandLine = new ArrayList<>();
// first: The command name.
@@ -96,17 +96,6 @@
// second: The compiler options.
commandLine.addAll(getCompilerOptions(overwrittenVariables));
-
- if (!featureConfiguration.isEnabled(CppRuleClasses.COMPILE_ACTION_FLAGS_IN_FLAG_SET)) {
- // third: The file to compile!
- commandLine.add("-c");
- commandLine.add(sourceFile.getExecPathString());
-
- // finally: The output file. (Prefixed with -o).
- commandLine.add("-o");
- commandLine.add(outputFile.getPathString());
- }
-
return commandLine;
}
@@ -124,19 +113,6 @@
addFilteredOptions(
options, featureConfiguration.getPerFeatureExpansions(actionName, updatedVariables));
- if (!featureConfiguration.isEnabled("compile_action_flags_in_flag_set")) {
- if (FileType.contains(outputFile, CppFileTypes.ASSEMBLER, CppFileTypes.PIC_ASSEMBLER)) {
- options.add("-S");
- } else if (FileType.contains(
- outputFile,
- CppFileTypes.PREPROCESSED_C,
- CppFileTypes.PREPROCESSED_CPP,
- CppFileTypes.PIC_PREPROCESSED_C,
- CppFileTypes.PIC_PREPROCESSED_CPP)) {
- options.add("-E");
- }
- }
-
return options;
}
@@ -182,19 +158,16 @@
public static Builder builder(
Artifact sourceFile,
- Artifact outputFile,
CoptsFilter coptsFilter,
String actionName,
PathFragment crosstoolTopPathFragment,
DotdFile dotdFile) {
- return new Builder(
- sourceFile, outputFile, coptsFilter, actionName, crosstoolTopPathFragment, dotdFile);
+ return new Builder(sourceFile, coptsFilter, actionName, crosstoolTopPathFragment, dotdFile);
}
/** A builder for a {@link CompileCommandLine}. */
public static final class Builder {
private final Artifact sourceFile;
- private final Artifact outputFile;
private CoptsFilter coptsFilter;
private FeatureConfiguration featureConfiguration;
private CcToolchainFeatures.Variables variables = Variables.EMPTY;
@@ -205,7 +178,6 @@
public CompileCommandLine build() {
return new CompileCommandLine(
Preconditions.checkNotNull(sourceFile),
- Preconditions.checkNotNull(outputFile),
Preconditions.checkNotNull(coptsFilter),
Preconditions.checkNotNull(featureConfiguration),
Preconditions.checkNotNull(crosstoolTopPathFragment),
@@ -216,13 +188,11 @@
private Builder(
Artifact sourceFile,
- Artifact outputFile,
CoptsFilter coptsFilter,
String actionName,
PathFragment crosstoolTopPathFragment,
DotdFile dotdFile) {
this.sourceFile = sourceFile;
- this.outputFile = outputFile;
this.coptsFilter = coptsFilter;
this.actionName = actionName;
this.crosstoolTopPathFragment = crosstoolTopPathFragment;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
index bab2726..a12e21d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java
@@ -70,6 +70,8 @@
" implies: 'user_compile_flags'",
" implies: 'sysroot'",
" implies: 'unfiltered_compile_flags'",
+ " implies: 'compiler_input_flags'",
+ " implies: 'compiler_output_flags'",
"}",
"action_config {",
" config_name: 'preprocess-assemble'",
@@ -81,6 +83,8 @@
" implies: 'user_compile_flags'",
" implies: 'sysroot'",
" implies: 'unfiltered_compile_flags'",
+ " implies: 'compiler_input_flags'",
+ " implies: 'compiler_output_flags'",
"}",
"action_config {",
" config_name: 'linkstamp-compile'",
@@ -92,6 +96,8 @@
" implies: 'user_compile_flags'",
" implies: 'sysroot'",
" implies: 'unfiltered_compile_flags'",
+ " implies: 'compiler_input_flags'",
+ " implies: 'compiler_output_flags'",
"}",
"action_config {",
" config_name: 'c-compile'",
@@ -103,6 +109,8 @@
" implies: 'user_compile_flags'",
" implies: 'sysroot'",
" implies: 'unfiltered_compile_flags'",
+ " implies: 'compiler_input_flags'",
+ " implies: 'compiler_output_flags'",
"}",
"action_config {",
" config_name: 'c++-compile'",
@@ -114,6 +122,8 @@
" implies: 'user_compile_flags'",
" implies: 'sysroot'",
" implies: 'unfiltered_compile_flags'",
+ " implies: 'compiler_input_flags'",
+ " implies: 'compiler_output_flags'",
"}",
"action_config {",
" config_name: 'c++-header-parsing'",
@@ -125,6 +135,8 @@
" implies: 'user_compile_flags'",
" implies: 'sysroot'",
" implies: 'unfiltered_compile_flags'",
+ " implies: 'compiler_input_flags'",
+ " implies: 'compiler_output_flags'",
"}",
"action_config {",
" config_name: 'c++-header-preprocessing'",
@@ -136,6 +148,8 @@
" implies: 'user_compile_flags'",
" implies: 'sysroot'",
" implies: 'unfiltered_compile_flags'",
+ " implies: 'compiler_input_flags'",
+ " implies: 'compiler_output_flags'",
"}",
"action_config {",
" config_name: 'c++-module-compile'",
@@ -147,6 +161,8 @@
" implies: 'user_compile_flags'",
" implies: 'sysroot'",
" implies: 'unfiltered_compile_flags'",
+ " implies: 'compiler_input_flags'",
+ " implies: 'compiler_output_flags'",
"}",
"action_config {",
" config_name: 'c++-module-codegen'",
@@ -158,6 +174,8 @@
" implies: 'user_compile_flags'",
" implies: 'sysroot'",
" implies: 'unfiltered_compile_flags'",
+ " implies: 'compiler_input_flags'",
+ " implies: 'compiler_output_flags'",
"}",
ifTrue(
!existingFeatureNames.contains(CppRuleClasses.LEGACY_COMPILE_FLAGS),
@@ -1060,6 +1078,68 @@
" flag: '@%{linker_param_file}'",
" }",
" }",
+ "}"),
+ ifTrue(
+ !existingFeatureNames.contains("compiler_input_flags"),
+ "feature {",
+ " name: 'compiler_input_flags'",
+ " enabled: true",
+ " flag_set {",
+ " action: 'assemble'",
+ " action: 'preprocess-assemble'",
+ " action: 'c-compile'",
+ " action: 'c++-compile'",
+ " action: 'linkstamp-compile'",
+ " action: 'c++-module-compile'",
+ " action: 'c++-module-codegen'",
+ " action: 'objc-compile'",
+ " action: 'objc++-compile'",
+ " action: 'c++-header-preprocessing'",
+ " action: 'c++-header-parsing'",
+ " action: 'lto-backend'",
+ " expand_if_all_available: 'source_file'",
+ " flag_group {",
+ " flag: '-c'",
+ " flag: '%{source_file}'",
+ " }",
+ " }",
+ "}"),
+ ifTrue(
+ !existingFeatureNames.contains("compiler_output_flags"),
+ "feature {",
+ " name: 'compiler_output_flags'",
+ " enabled: true",
+ " flag_set {",
+ " action: 'assemble'",
+ " action: 'preprocess-assemble'",
+ " action: 'c-compile'",
+ " action: 'c++-compile'",
+ " action: 'linkstamp-compile'",
+ " action: 'c++-module-compile'",
+ " action: 'c++-module-codegen'",
+ " action: 'objc-compile'",
+ " action: 'objc++-compile'",
+ " action: 'c++-header-preprocessing'",
+ " action: 'c++-header-parsing'",
+ " action: 'lto-backend'",
+ " flag_group {",
+ " expand_if_all_available: 'output_object_file'",
+ " flag: '-o'",
+ " flag: '%{output_object_file}'",
+ " }",
+ " flag_group {",
+ " expand_if_all_available: 'output_assembly_file'",
+ " flag: '-S'",
+ " flag: '-o'",
+ " flag: '%{output_assembly_file}'",
+ " }",
+ " flag_group {",
+ " expand_if_all_available: 'output_preprocess_file'",
+ " flag: '-E'",
+ " flag: '-o'",
+ " flag: '%{output_preprocess_file}'",
+ " }",
+ " }",
"}")));
}
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 15cf6a7..91534e5 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
@@ -322,7 +322,6 @@
this.compileCommandLine =
CompileCommandLine.builder(
sourceFile,
- outputFile,
coptsFilter,
actionName,
crosstoolTopPathFragment,
@@ -624,7 +623,7 @@
@Override
public List<String> getCmdlineIncludes() {
ImmutableList.Builder<String> cmdlineIncludes = ImmutableList.builder();
- List<String> args = getArgv();
+ List<String> args = getArguments();
for (Iterator<String> argi = args.iterator(); argi.hasNext();) {
String arg = argi.next();
if (arg.equals("-include") && argi.hasNext()) {
@@ -686,21 +685,9 @@
return ImmutableMap.copyOf(environment);
}
- /**
- * Returns a new, mutable list of command and arguments (argv) to be passed
- * to the gcc subprocess.
- */
- public final List<String> getArgv() {
- return getArgv(getInternalOutputFile());
- }
-
- protected final List<String> getArgv(PathFragment outputFile) {
- return compileCommandLine.getArgv(outputFile, overwrittenVariables);
- }
-
@Override
public List<String> getArguments() {
- return getArgv();
+ return compileCommandLine.getArguments(overwrittenVariables);
}
@Override
@@ -1050,7 +1037,8 @@
public ResourceSet estimateResourceConsumptionLocal() {
// We use a local compile, so much of the time is spent waiting for IO,
// but there is still significant CPU; hence we estimate 50% cpu usage.
- return ResourceSet.createWithRamCpuIo(/*memoryMb=*/200, /*cpuUsage=*/0.5, /*ioUsage=*/0.0);
+ return ResourceSet.createWithRamCpuIo(
+ /* memoryMb= */ 200, /* cpuUsage= */ 0.5, /* ioUsage= */ 0.0);
}
@Override
@@ -1067,10 +1055,10 @@
// itself is fully determined by the input source files and module maps.
// A better long-term solution would be to make the compiler to find them automatically and
// never hand in the .pcm files explicitly on the command line in the first place.
- f.addStrings(compileCommandLine.getArgv(getInternalOutputFile(), null));
+ f.addStrings(compileCommandLine.getArguments(/* overwrittenVariables= */ null));
/*
- * getArgv() above captures all changes which affect the compilation
+ * getArguments() above captures all changes which affect the compilation
* command and hence the contents of the object file. But we need to
* also make sure that we reexecute the action if any of the fields
* that affect whether validateIncludes() will report an error or warning
@@ -1313,9 +1301,9 @@
message.append(getProgressMessage());
message.append('\n');
// Outputting one argument per line makes it easier to diff the results.
- // The first element in getArgv() is actually the command to execute.
+ // The first element in getArguments() is actually the command to execute.
String legend = " Command: ";
- for (String argument : ShellEscaper.escapeAll(getArgv())) {
+ for (String argument : ShellEscaper.escapeAll(getArguments())) {
message.append(legend);
message.append(argument);
message.append('\n');
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
index 7940984..6245420 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
@@ -147,13 +147,6 @@
public static final String RANDOM_SEED = "random_seed";
/**
- * A string constant for the compile_action_flags_in_flag_set feature. This feature is just a
- * transitional feature which helps telling whether -c and -o options are already in flag_set of
- * action_config in CROSSTOOL file. Once the transition is done, it should be removed.
- */
- public static final String COMPILE_ACTION_FLAGS_IN_FLAG_SET = "compile_action_flags_in_flag_set";
-
- /**
* A string constant for the dependency_file feature. This feature generates the .d file.
*/
public static final String DEPENDENCY_FILE = "dependency_file";
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
index acdaafd..382d712 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FakeCppCompileAction.java
@@ -207,14 +207,12 @@
// line to write to $TEST_TMPDIR instead.
final String outputPrefix = "$TEST_TMPDIR/";
String argv =
- getArgv(outputFile.getExecPath())
+ getArguments()
.stream()
.map(
input -> {
String result = ShellEscaper.escapeString(input);
- // Once -c and -o options are added into action_config, the argument of
- // getArgv(outputFile.getExecPath()) won't be used anymore. There will always be
- // -c <tempOutputFile>, but here it has to be outputFile, so we replace it.
+ // Replace -c <tempOutputFile> so it's -c <outputFile>.
if (input.equals(tempOutputFile.getPathString())) {
result =
outputPrefix + ShellEscaper.escapeString(outputFile.getExecPathString());
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java
index d0f68c9..ed3fa22 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java
@@ -41,17 +41,18 @@
CppCompileAction action, ActionExecutionContext actionExecutionContext)
throws ExecException, InterruptedException {
Iterable<Artifact> inputs = Iterables.concat(action.getInputs(), action.getAdditionalInputs());
- Spawn spawn = new SimpleSpawn(
- action,
- ImmutableList.copyOf(action.getArgv()),
- ImmutableMap.copyOf(action.getEnvironment()),
- ImmutableMap.copyOf(action.getExecutionInfo()),
- EmptyRunfilesSupplier.INSTANCE,
- ImmutableList.<Artifact>copyOf(inputs),
- /*tools=*/ImmutableList.<Artifact>of(),
- /*filesetManifests=*/ImmutableList.<Artifact>of(),
- action.getOutputs().asList(),
- action.estimateResourceConsumptionLocal());
+ Spawn spawn =
+ new SimpleSpawn(
+ action,
+ ImmutableList.copyOf(action.getArguments()),
+ ImmutableMap.copyOf(action.getEnvironment()),
+ ImmutableMap.copyOf(action.getExecutionInfo()),
+ EmptyRunfilesSupplier.INSTANCE,
+ ImmutableList.copyOf(inputs),
+ /* tools= */ ImmutableList.of(),
+ /* filesetManifests= */ ImmutableList.of(),
+ action.getOutputs().asList(),
+ action.estimateResourceConsumptionLocal());
List<SpawnResult> spawnResults =
actionExecutionContext
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
index f768eda..b6bd529 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
@@ -517,7 +517,6 @@
.add(CppRuleClasses.COMPILE_ALL_MODULES)
.add(CppRuleClasses.EXCLUDE_PRIVATE_HEADERS_IN_MODULE_MAPS)
.add(CppRuleClasses.ONLY_DOTH_HEADERS_IN_MODULE_MAPS)
- .add(CppRuleClasses.COMPILE_ACTION_FLAGS_IN_FLAG_SET)
.add(CppRuleClasses.DEPENDENCY_FILE)
.add(CppRuleClasses.INCLUDE_PATHS)
.add(isHost ? "host" : "nonhost")
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
index ef439b4..f4cde05 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
@@ -1236,6 +1236,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -1305,6 +1359,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -1328,6 +1384,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -1351,6 +1409,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -1369,6 +1429,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -1387,6 +1449,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -1405,6 +1469,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -1432,6 +1498,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc++-compile"
@@ -1460,6 +1528,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "assemble"
@@ -1476,6 +1546,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -1494,6 +1566,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -2968,6 +3042,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -3037,6 +3165,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -3060,6 +3190,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -3083,6 +3215,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -3101,6 +3235,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -3119,6 +3255,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -3137,6 +3275,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -3164,6 +3304,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc++-compile"
@@ -3192,6 +3334,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "assemble"
@@ -3208,6 +3352,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -3226,6 +3372,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -4695,6 +4843,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -4764,6 +4966,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -4787,6 +4991,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -4810,6 +5016,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -4828,6 +5036,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -4846,6 +5056,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -4864,6 +5076,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -4891,6 +5105,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc++-compile"
@@ -4919,6 +5135,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "assemble"
@@ -4935,6 +5153,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -4953,6 +5173,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -6422,6 +6644,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -6491,6 +6767,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -6514,6 +6792,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -6537,6 +6817,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -6555,6 +6837,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -6573,6 +6857,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -6591,6 +6877,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -6618,6 +6906,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc++-compile"
@@ -6646,6 +6936,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "assemble"
@@ -6662,6 +6954,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -6680,6 +6974,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -8157,6 +8453,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -8226,6 +8576,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -8249,6 +8601,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -8272,6 +8626,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -8290,6 +8646,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -8308,6 +8666,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -8326,6 +8686,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -8353,6 +8715,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_simulator_compiler_flags"
}
action_config {
@@ -8382,6 +8746,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_simulator_compiler_flags"
}
action_config {
@@ -8399,6 +8765,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -8417,6 +8785,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -9896,6 +10266,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -9965,6 +10389,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -9988,6 +10414,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -10011,6 +10439,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -10029,6 +10459,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -10047,6 +10479,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -10065,6 +10499,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -10092,6 +10528,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_simulator_compiler_flags"
}
action_config {
@@ -10121,6 +10559,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_simulator_compiler_flags"
}
action_config {
@@ -10138,6 +10578,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -10156,6 +10598,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -11658,6 +12102,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -11727,6 +12225,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -11751,6 +12251,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -11775,6 +12277,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -11793,6 +12297,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -11812,6 +12318,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -11831,6 +12339,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -11859,6 +12369,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_simulator_compiler_flags"
}
action_config {
@@ -11888,6 +12400,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_simulator_compiler_flags"
}
action_config {
@@ -11905,6 +12419,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -11924,6 +12440,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -13402,6 +13920,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -13471,6 +14043,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -13494,6 +14068,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -13517,6 +14093,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -13535,6 +14113,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -13553,6 +14133,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -13571,6 +14153,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -13598,6 +14182,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_simulator_compiler_flags"
}
action_config {
@@ -13627,6 +14213,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_simulator_compiler_flags"
}
action_config {
@@ -13644,6 +14232,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -13662,6 +14252,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -15161,6 +15753,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -15230,6 +15876,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -15253,6 +15901,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -15276,6 +15926,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -15294,6 +15946,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -15312,6 +15966,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -15330,6 +15986,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -15357,6 +16015,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc++-compile"
@@ -15385,6 +16045,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "assemble"
@@ -15401,6 +16063,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -15419,6 +16083,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -16920,6 +17586,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -16989,6 +17709,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -17012,6 +17734,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -17035,6 +17759,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -17053,6 +17779,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -17071,6 +17799,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -17089,6 +17819,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -17116,6 +17848,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc++-compile"
@@ -17144,6 +17878,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "assemble"
@@ -17160,6 +17896,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -17178,6 +17916,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -18702,6 +19442,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -18771,6 +19565,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -18795,6 +19591,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -18819,6 +19617,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -18837,6 +19637,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -18856,6 +19658,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -18875,6 +19679,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -18903,6 +19709,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc++-compile"
@@ -18931,6 +19739,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "assemble"
@@ -18947,6 +19757,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -18966,6 +19778,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -20466,6 +21280,60 @@
}
}
feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
+ feature {
name: "dbg_only_flag"
flag_set {
action: "objc-compile"
@@ -20535,6 +21403,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -20558,6 +21428,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -20581,6 +21453,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -20599,6 +21473,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -20617,6 +21493,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -20635,6 +21513,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -20662,6 +21542,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc++-compile"
@@ -20690,6 +21572,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "assemble"
@@ -20706,6 +21590,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -20724,6 +21610,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
diff --git a/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
index 8617060..70fe4e0 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/ToolchainTypeTest.java
@@ -125,7 +125,7 @@
.write();
CppCompileAction compileAction =
(CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cclib/cclib/a.o", cclibrary));
- assertThat(compileAction.getArgv()).contains("foobarpiii");
+ assertThat(compileAction.getArguments()).contains("foobarpiii");
ConfiguredTarget ccbinary =
ScratchAttributeWriter.fromLabelString(this, "cc_binary", "//ccbin")
@@ -134,7 +134,7 @@
.write();
compileAction =
(CppCompileAction) getGeneratingAction(getBinArtifact("_objs/ccbin/ccbin/a.o", ccbinary));
- assertThat(compileAction.getArgv()).contains("foobarpiii");
+ assertThat(compileAction.getArguments()).contains("foobarpiii");
ConfiguredTarget cctest =
ScratchAttributeWriter.fromLabelString(this, "cc_test", "//cctest")
@@ -143,6 +143,6 @@
.write();
compileAction =
(CppCompileAction) getGeneratingAction(getBinArtifact("_objs/cctest/cctest/a.o", cctest));
- assertThat(compileAction.getArgv()).contains("foobarpiii");
+ assertThat(compileAction.getArguments()).contains("foobarpiii");
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
index 6447612..20ffd40 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
@@ -376,19 +376,19 @@
" srcs = [ 'library.cc' ],",
" nocopts = '-fPIC')");
- assertThat(getCppCompileAction("//a:pic").getArgv()).contains("-fPIC");
- assertThat(getCppCompileAction("//a:libpic.so").getArgv()).contains("-fPIC");
- assertThat(getCppCompileAction("//a:piclib").getArgv()).contains("-fPIC");
- assertThat(getCppCompileAction("//a:nopic").getArgv()).doesNotContain("-fPIC");
- assertThat(getCppCompileAction("//a:libnopic.so").getArgv()).doesNotContain("-fPIC");
- assertThat(getCppCompileAction("//a:nopiclib").getArgv()).doesNotContain("-fPIC");
+ assertThat(getCppCompileAction("//a:pic").getArguments()).contains("-fPIC");
+ assertThat(getCppCompileAction("//a:libpic.so").getArguments()).contains("-fPIC");
+ assertThat(getCppCompileAction("//a:piclib").getArguments()).contains("-fPIC");
+ assertThat(getCppCompileAction("//a:nopic").getArguments()).doesNotContain("-fPIC");
+ assertThat(getCppCompileAction("//a:libnopic.so").getArguments()).doesNotContain("-fPIC");
+ assertThat(getCppCompileAction("//a:nopiclib").getArguments()).doesNotContain("-fPIC");
}
@Test
public void testPicModeAssembly() throws Exception {
useConfiguration("--cpu=k8");
scratch.file("a/BUILD", "cc_library(name='preprocess', srcs=['preprocess.S'])");
- List<String> argv = getCppCompileAction("//a:preprocess").getArgv();
+ List<String> argv = getCppCompileAction("//a:preprocess").getArguments();
assertThat(argv).contains("-fPIC");
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
index 513b642..7622fb3 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java
@@ -91,7 +91,7 @@
" }",
"}"))
.build();
- assertThat(compileCommandLine.getArgv(scratchArtifact("a/FakeOutput").getExecPath(), null))
+ assertThat(compileCommandLine.getArguments(/* overwrittenVariables= */ null))
.contains("-some_foo_flag");
}
@@ -133,13 +133,12 @@
"}"))
.setCoptsFilter(CoptsFilter.fromRegex(Pattern.compile(".*i_am_a_flag.*")))
.build();
- return compileCommandLine.getArgv(scratchArtifact("a/FakeOutput").getExecPath(), null);
+ return compileCommandLine.getArguments(/* overwrittenVariables= */ null);
}
private Builder makeCompileCommandLineBuilder() throws Exception {
return CompileCommandLine.builder(
scratchArtifact("a/FakeInput"),
- scratchArtifact("a/FakeOutput"),
CoptsFilter.alwaysPasses(),
"c++-compile",
getTargetConfiguration().getFragment(CppConfiguration.class).getCrosstoolTopPathFragment(),
diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index 0a96846..2588c3a 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -673,11 +673,6 @@
name: 'random_seed'
}
- # This feature is just for enabling flag_set in action_config for -c and -o options during the transitional period
- feature {
- name: 'compile_action_flags_in_flag_set'
- }
-
action_config {
config_name: 'c-compile'
action_name: 'c-compile'
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl
index 67283ad..8f87512 100644
--- a/tools/cpp/CROSSTOOL.tpl
+++ b/tools/cpp/CROSSTOOL.tpl
@@ -292,16 +292,10 @@
}
}
- # This feature is just for enabling flag_set in action_config for -c and -o options during the transitional period
- feature {
- name: 'compile_action_flags_in_flag_set'
- }
-
feature {
name: 'has_configured_linker_path'
}
-
# This feature indicates strip is not supported, building stripped binary will just result a copy of orignial binary
feature {
name: 'no_stripping'
diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl
index af544e9..e16052b 100644
--- a/tools/osx/crosstool/CROSSTOOL.tpl
+++ b/tools/osx/crosstool/CROSSTOOL.tpl
@@ -1164,6 +1164,60 @@
expand_if_all_available: "linker_param_file"
}
}
+ feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
action_config {
config_name: "strip"
action_name: "strip"
@@ -1202,6 +1256,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -1220,6 +1276,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -1238,6 +1296,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -1256,6 +1316,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -1274,6 +1336,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -1292,6 +1356,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -1306,6 +1372,8 @@
flag: "x86_64"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "objc_actions"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
@@ -1336,6 +1404,8 @@
flag: "-std=gnu++11"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
implies: "framework_paths"
@@ -1365,6 +1435,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -1383,6 +1455,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -2804,6 +2878,60 @@
expand_if_all_available: "linker_param_file"
}
}
+ feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
action_config {
config_name: "strip"
action_name: "strip"
@@ -2842,6 +2970,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -2860,6 +2990,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -2878,6 +3010,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -2896,6 +3030,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -2914,6 +3050,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -2932,6 +3070,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -2946,6 +3086,8 @@
flag: "x86_64"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "objc_actions"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
@@ -2977,6 +3119,8 @@
flag: "-std=gnu++11"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
implies: "framework_paths"
@@ -3007,6 +3151,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -3025,6 +3171,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -4448,6 +4596,60 @@
expand_if_all_available: "linker_param_file"
}
}
+ feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
action_config {
config_name: "strip"
action_name: "strip"
@@ -4486,6 +4688,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -4504,6 +4708,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -4522,6 +4728,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -4540,6 +4748,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -4558,6 +4768,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -4576,6 +4788,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -4590,6 +4804,8 @@
flag: "i386"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "objc_actions"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
@@ -4621,6 +4837,8 @@
flag: "-std=gnu++11"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
implies: "framework_paths"
@@ -4651,6 +4869,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -4669,6 +4889,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -6112,6 +6334,60 @@
expand_if_all_available: "linker_param_file"
}
}
+ feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
action_config {
config_name: "strip"
action_name: "strip"
@@ -6150,6 +6426,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -6169,6 +6447,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -6188,6 +6468,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -6206,6 +6488,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -6225,6 +6509,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -6244,6 +6530,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -6259,6 +6547,8 @@
flag: "x86_64"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "objc_actions"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
@@ -6290,6 +6580,8 @@
flag: "-std=gnu++11"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
implies: "framework_paths"
@@ -6320,6 +6612,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -6339,6 +6633,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -7763,6 +8059,60 @@
expand_if_all_available: "linker_param_file"
}
}
+ feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
action_config {
config_name: "strip"
action_name: "strip"
@@ -7801,6 +8151,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -7819,6 +8171,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -7837,6 +8191,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -7855,6 +8211,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -7873,6 +8231,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -7891,6 +8251,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -7905,6 +8267,8 @@
flag: "i386"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "objc_actions"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
@@ -7936,6 +8300,8 @@
flag: "-std=gnu++11"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
implies: "framework_paths"
@@ -7966,6 +8332,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -7984,6 +8352,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -9395,6 +9765,60 @@
expand_if_all_available: "linker_param_file"
}
}
+ feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
action_config {
config_name: "strip"
action_name: "strip"
@@ -9433,6 +9857,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -9451,6 +9877,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -9469,6 +9897,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -9487,6 +9917,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -9505,6 +9937,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -9523,6 +9957,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -9537,6 +9973,8 @@
flag: "armv7"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "objc_actions"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
@@ -9567,6 +10005,8 @@
flag: "-std=gnu++11"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
implies: "framework_paths"
@@ -9596,6 +10036,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -9614,6 +10056,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -11027,6 +11471,60 @@
expand_if_all_available: "linker_param_file"
}
}
+ feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
action_config {
config_name: "strip"
action_name: "strip"
@@ -11065,6 +11563,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -11083,6 +11583,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -11101,6 +11603,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -11119,6 +11623,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -11137,6 +11643,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -11155,6 +11663,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -11169,6 +11679,8 @@
flag: "armv7k"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "objc_actions"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
@@ -11199,6 +11711,8 @@
flag: "-std=gnu++11"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
implies: "framework_paths"
@@ -11228,6 +11742,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -11246,6 +11762,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -12679,6 +13197,60 @@
expand_if_all_available: "linker_param_file"
}
}
+ feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
action_config {
config_name: "strip"
action_name: "strip"
@@ -12717,6 +13289,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -12736,6 +13310,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -12755,6 +13331,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -12773,6 +13351,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -12792,6 +13372,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -12811,6 +13393,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -12826,6 +13410,8 @@
flag: "arm64"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "objc_actions"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
@@ -12856,6 +13442,8 @@
flag: "-std=gnu++11"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
implies: "framework_paths"
@@ -12885,6 +13473,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -12904,6 +13494,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "unfiltered_cxx_flags"
}
action_config {
@@ -14318,6 +14910,60 @@
expand_if_all_available: "linker_param_file"
}
}
+ feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
action_config {
config_name: "strip"
action_name: "strip"
@@ -14356,6 +15002,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -14374,6 +15022,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -14392,6 +15042,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -14410,6 +15062,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -14428,6 +15082,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -14446,6 +15102,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -14460,6 +15118,8 @@
flag: "arm64"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "objc_actions"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
@@ -14490,6 +15150,8 @@
flag: "-std=gnu++11"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
implies: "framework_paths"
@@ -14519,6 +15181,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -14537,6 +15201,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
@@ -15951,6 +16617,60 @@
expand_if_all_available: "linker_param_file"
}
}
+ feature {
+ name: "compiler_input_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-c"
+ flag: "%{source_file}"
+ }
+ expand_if_all_available: "source_file"
+ }
+ }
+ feature {
+ name: "compiler_output_flags"
+ flag_set {
+ action: "assemble"
+ action: "preprocess-assemble"
+ action: "c-compile"
+ action: "c++-compile"
+ action: "linkstamp-compile"
+ action: "c++-header-parsing"
+ action: "c++-header-preprocessing"
+ action: "c++-module-compile"
+ action: "c++-module-codegen"
+ action: "objc-compile"
+ action: "objc++-compile"
+ flag_group {
+ flag: "-o"
+ flag: "%{output_object_file}"
+ expand_if_all_available: "output_object_file"
+ }
+ flag_group {
+ flag: "-S"
+ flag: "-o"
+ flag: "%{output_assembly_file}"
+ expand_if_all_available: "output_assembly_file"
+ }
+ flag_group {
+ flag: "-E"
+ flag: "-o"
+ flag: "%{output_preprocess_file}"
+ expand_if_all_available: "output_preprocess_file"
+ }
+ }
+ }
action_config {
config_name: "strip"
action_name: "strip"
@@ -15989,6 +16709,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-compile"
@@ -16007,6 +16729,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "linkstamp-compile"
@@ -16025,6 +16749,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-module-compile"
@@ -16043,6 +16769,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-parsing"
@@ -16061,6 +16789,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "c++-header-preprocessing"
@@ -16079,6 +16809,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-compile"
@@ -16093,6 +16825,8 @@
flag: "<architecture>"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "objc_actions"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
@@ -16123,6 +16857,8 @@
flag: "-std=gnu++11"
}
}
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
implies: "apply_default_compiler_flags"
implies: "apply_default_warnings"
implies: "framework_paths"
@@ -16152,6 +16888,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "preprocess-assemble"
@@ -16170,6 +16908,8 @@
implies: "user_compile_flags"
implies: "sysroot"
implies: "unfiltered_compile_flags"
+ implies: "compiler_input_flags"
+ implies: "compiler_output_flags"
}
action_config {
config_name: "objc-archive"
