diff options
| -rw-r--r-- | site/docs/bazel-user-manual.html | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/site/docs/bazel-user-manual.html b/site/docs/bazel-user-manual.html index 5eaaab3d72..d13b7b69ce 100644 --- a/site/docs/bazel-user-manual.html +++ b/site/docs/bazel-user-manual.html @@ -3183,7 +3183,7 @@ in an environment closer to the current shell environment. Note that none of the <a href='build-encyclopedia.html#make_variables' >"Make" environment</a>. If the <code class='flag'>--show_make_env</code> flag is specified, all variables in the current configuration's "Make" environment - are also displayed (e.g. <code>CC</code>, <code>GNU_TARGET</code>, etc). + are also displayed (e.g. <code>CC</code>, <code>GLIBC_VERSION</code>, etc). These are the variables accessed using the <code>$(CC)</code> or <code>varref("CC")</code> syntax inside BUILD files. </li> diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java index e6e55d437b..0c53af0e15 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java @@ -1055,8 +1055,6 @@ public final class BuildConfiguration implements Serializable { // These variables will be used on Windows as well, so we need to make sure // that paths use the correct system file-separator. globalMakeEnvBuilder.put("BINDIR", getBinDirectory().getExecPath().getPathString()); - globalMakeEnvBuilder.put("INCDIR", - getIncludeDirectory().getExecPath().getPathString()); globalMakeEnvBuilder.put("GENDIR", getGenfilesDirectory().getExecPath().getPathString()); globalMakeEnv = globalMakeEnvBuilder.build(); |