Skip to content

Commit

Permalink
Description redacted.
Browse files Browse the repository at this point in the history
--
PiperOrigin-RevId: 144983864
MOS_MIGRATED_REVID=144983864
  • Loading branch information
Googler authored and vladmos committed Jan 20, 2017
1 parent c8e1cfb commit f36d093
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ ImmutableList<String> evaluate(Iterable<String> features) {
private final String targetCpu;
private final String targetSystemName;
private final String targetLibc;
private final String targetOS;
private final LipoMode lipoMode;
private final PathFragment crosstoolTopPathFragment;

Expand Down Expand Up @@ -352,6 +353,7 @@ protected CppConfiguration(CppConfigurationParameters params)
this.lipoMode = cppOptions.getLipoMode();
this.targetSystemName = toolchain.getTargetSystemName();
this.targetLibc = toolchain.getTargetLibc();
this.targetOS = toolchain.getCcTargetOs();
this.crosstoolTop = params.crosstoolTop;
this.ccToolchainLabel = params.ccToolchainLabel;
this.compilationMode = params.commonOptions.compilationMode;
Expand Down Expand Up @@ -1177,6 +1179,11 @@ public String getTargetCpu() {
return targetCpu;
}

/** Unused, for compatibility with things internal to Google. */
public String getTargetOS() {
return targetOS;
}

/**
* Returns the path fragment that is either absolute or relative to the
* execution root that can be used to execute the given tool.
Expand Down
5 changes: 4 additions & 1 deletion src/main/protobuf/crosstool_config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,10 @@ message CToolchain {
// why they are recorded here.
repeated string debian_extra_requires = 33;

// Next free id: 55
// Unused, for compatibility with things internal to Google.
optional string cc_target_os = 55;

// Next free id: 56
}

message ToolPath {
Expand Down

0 comments on commit f36d093

Please sign in to comment.