Flip the default value of --experimental_toolchain_id_in_output_directory to false and make the option a no-op.

RELNOTES[INC]: C++ toolchain identifiers are not in the name of the output directory anymore.

PiperOrigin-RevId: 172594237

2 files changed, 3 insertions, 28 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index 5296948c6a..359dbb2eb1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -264,16 +264,12 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
    */
   private final boolean lipoContextCollector;
 
-  /** If true, add the toolchain identifier to the name of the output directory. */
-  private final boolean toolchainIdInOutputDirectory;
-
   private final CppToolchainInfo cppToolchainInfo;
 
   protected CppConfiguration(CppConfigurationParameters params)
       throws InvalidConfigurationException {
     CrosstoolConfig.CToolchain toolchain = params.toolchain;
     cppOptions = params.cppOptions;
-    this.toolchainIdInOutputDirectory = cppOptions.toolchainIdInOutputDirectory;
     this.desiredCpu = Preconditions.checkNotNull(params.commonOptions.cpu);
     this.lipoMode = cppOptions.getLipoMode();
     this.convertLipoToThinLto = cppOptions.convertLipoToThinLto;
@@ -1583,14 +1579,9 @@ public class CppConfiguration extends BuildConfiguration.Fragment {
     } else {
       lipoSuffix = "";
     }
-    String toolchainPrefix;
-    if (toolchainIdInOutputDirectory) {
-      toolchainPrefix = cppToolchainInfo.getToolchainIdentifier();
-    } else {
-      toolchainPrefix = desiredCpu;
-      if (!cppOptions.outputDirectoryTag.isEmpty()) {
-        toolchainPrefix += "-" + cppOptions.outputDirectoryTag;
-      }
+    String toolchainPrefix = desiredCpu;
+    if (!cppOptions.outputDirectoryTag.isEmpty()) {
+      toolchainPrefix += "-" + cppOptions.outputDirectoryTag;
     }
 
     return toolchainPrefix + lipoSuffix;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
index 1a2b3b715d..0e3b7a9379 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -572,17 +572,6 @@ public class CppOptions extends FragmentOptions {
    */
   public Label lipoContextForBuild;
 
-  @Option(
-    name = "experimental_toolchain_id_in_output_directory",
-    defaultValue = "true",
-    category = "semantics",
-    documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
-    effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
-    metadataTags = {OptionMetadataTag.EXPERIMENTAL},
-    help = "Whether to embed the name of the C++ toolchain in the name of the output directory"
-  )
-  public boolean toolchainIdInOutputDirectory;
-
   /**
    * Returns the --lipo_context value if LIPO is specified and active for this configuration,
    * null otherwise.
@@ -876,11 +865,6 @@ public class CppOptions extends FragmentOptions {
       host.crosstoolTop = hostCrosstoolTop;
     }
 
-    // the name of the output directory for the host configuration is forced to be "host" in
-    // BuildConfiguration.Options#getHost(), but let's be prudent here in case someone ends up
-    // removing that
-    host.toolchainIdInOutputDirectory = toolchainIdInOutputDirectory;
-
     // hostLibcTop doesn't default to the target's libcTop.
     // Only an explicit command-line option will change it.
     // The default is whatever the host's crosstool (which might have been specified