diff options
author | Lukacs Berki <lberki@google.com> | 2016-06-14 08:44:48 +0000 |
---|---|---|
committer | Yue Gan <yueg@google.com> | 2016-06-14 11:02:45 +0000 |
commit | ac10999fabcc82ffbefaece376cc86ce209d6695 (patch) | |
tree | 2932f36e4d65eee06b0f2d688a8fd97b6f698313 /src/main/java/com/google/devtools/build/lib/rules | |
parent | 92d6ec07cfd405e19077164afa38a7501e735520 (diff) |
Minor refactoring of C++ compilation.
--
MOS_MIGRATED_REVID=124815043
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java index 2569b4d9ea..33f894f3b0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java @@ -559,8 +559,7 @@ public final class CppModel { if (fake) { boolean usePic = !generateNoPicAction; createFakeSourceAction(outputName, result, env, builder, outputExtension, - dependencyFileExtension, addObject, ccRelativeName, sourceArtifact.getExecPath(), usePic, - generateDwo); + dependencyFileExtension, addObject, ccRelativeName, sourceArtifact.getExecPath(), usePic); } else { // Create PIC compile actions (same as non-PIC, but use -fPIC and // generate .pic.o, .pic.d, .pic.gcno instead of .o, .d, .gcno.) @@ -659,7 +658,7 @@ public final class CppModel { private void createFakeSourceAction(PathFragment outputName, CcCompilationOutputs.Builder result, AnalysisEnvironment env, CppCompileActionBuilder builder, String outputExtension, String dependencyFileExtension, boolean addObject, PathFragment ccRelativeName, - PathFragment execPath, boolean usePic, boolean generateDwo) { + PathFragment execPath, boolean usePic) { if (usePic) { outputExtension = ".pic" + outputExtension; dependencyFileExtension = ".pic" + dependencyFileExtension; @@ -674,9 +673,8 @@ public final class CppModel { .setDotdFile(outputName, dependencyFileExtension) .setTempOutputFile(tempOutputName); - Artifact dwoFile = generateDwo ? getDwoFile(outputFile) : null; - builder.setDwoFile(dwoFile); - setupBuildVariables(builder, usePic, ccRelativeName, execPath, null, dwoFile); + setupBuildVariables(builder, usePic, ccRelativeName, execPath, /*gcnoFile*/ null, + /*dwoFile*/ null); semantics.finalizeCompileActionBuilder(ruleContext, builder); CppCompileAction action = builder.build(); env.registerAction(action); |