diff options
| author |  George Gensure <ggensure@uberatc.com> | 2016-06-16 09:48:22 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-06-16 13:06:19 +0000 |
| commit | 2652976eb140836f459415be3ba908d86d77079f (patch) | |
| tree | 4d5bc91e1cd30f32d4ed1a991f0687b122dfa6e7 /src/main/java/com/google/devtools | |
| parent | 0e17046797f6cfed21755f2eed7c52c0a340d40c (diff) | |
Spawn executionInfo from Cpp{Compile,Link}Action
Pass the executionInfo available from a action argument to
Spawn{Gcc,Link}Strategy execution methods. This change makes
execution_requirements specified in CROSSTOOL effective at tool
execution time for compilations and links.
--
Change-Id: I92a6a9c6b19224756f0adb31673cddca94cfe658
Reviewed-on: https://bazel-review.googlesource.com/3760
MOS_MIGRATED_REVID=125041898
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnGccStrategy.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java | 3 |
2 files changed, 2 insertions, 4 deletions
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 4a97ce0e96..06cf50ed9f 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 @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.cpp; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.BaseSpawn; @@ -59,7 +58,7 @@ public class SpawnGccStrategy implements CppCompileActionContext { new BaseSpawn( action.getArgv(), action.getEnvironment(), - ImmutableMap.<String, String>of(), + action.getExecutionInfo(), action, estimateResourceConsumption(action)); spawnActionContext.exec(spawn, actionExecutionContext); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java index f9d494be4b..58883074e0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/SpawnLinkStrategy.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.rules.cpp; -import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.ActionExecutionContext; import com.google.devtools.build.lib.actions.ActionExecutionException; import com.google.devtools.build.lib.actions.BaseSpawn; @@ -43,7 +42,7 @@ public final class SpawnLinkStrategy implements CppLinkActionContext { new BaseSpawn( action.getCommandLine(), action.getEnvironment(), - ImmutableMap.<String, String>of(), + action.getExecutionInfo(), action, estimateResourceConsumption(action)); spawnActionContext.exec(spawn, actionExecutionContext); |