diff options
| author |  Ulf Adams <ulfjack@google.com> | 2016-08-29 14:48:47 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-08-29 15:37:35 +0000 |
| commit | e0437b167ad7ea57c985a2fe63c1e22b4e7fb23a (patch) | |
| tree | 64b3ca09b466f544ee2ddab2ea26a200724a62a2 /src/main | |
| parent | ae83197e8114d687e6bf7edf3507684b8b8c4aca (diff) | |
Remove BINMODE make variable. Use COMPILATION_MODE instead.
--
MOS_MIGRATED_REVID=131591324
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/google/devtools/build/docgen/templates/be/make-variables.vm | 4 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/docgen/templates/be/make-variables.vm b/src/main/java/com/google/devtools/build/docgen/templates/be/make-variables.vm index 35448ed4a9..35454f922b 100644 --- a/src/main/java/com/google/devtools/build/docgen/templates/be/make-variables.vm +++ b/src/main/java/com/google/devtools/build/docgen/templates/be/make-variables.vm @@ -107,10 +107,6 @@ in your genrule's cmd attribute. <p><strong>Tool option Variables</strong></p> <ul><!-- keep alphabetically sorted --> - <li><code>BINMODE</code>: "-dbg" or "-opt" - - . (<i>When using Bazel's <code>-c fastbuild</code> option, - this variable has the value <code>-dbg</code>.</i>) </li> <li><code>CC_FLAGS</code>: A minimal set of flags for the C compiler to be used by genrules. In particular, it contains flags to select the correct architecture if CC supports multiple architectures. </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 921f1b878a..4340be6eb2 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 @@ -1300,15 +1300,7 @@ public final class BuildConfiguration { fragment.addGlobalMakeVariables(globalMakeEnvBuilder); } - // Lots of packages in third_party assume that BINMODE expands to either "-dbg", or "-opt". So - // for backwards compatibility we preserve that invariant, setting BINMODE to "-dbg" rather than - // "-fastbuild" if the compilation mode is "fastbuild". - // We put the real compilation mode in a new variable COMPILATION_MODE. globalMakeEnvBuilder.put("COMPILATION_MODE", options.compilationMode.toString()); - globalMakeEnvBuilder.put("BINMODE", "-" - + ((options.compilationMode == CompilationMode.FASTBUILD) - ? "dbg" - : options.compilationMode.toString())); /* * Attention! Document these in the build-encyclopedia */ |