From daffc359d7c6961d9f741980438549bf74e6132c Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Mon, 18 Jan 2016 15:20:32 +0000 Subject: Use only the Bazel server for bootstrapping This remove all C++ compilation in bootstrapping itself. -- MOS_MIGRATED_REVID=112407516 --- .../java/com/google/devtools/build/lib/analysis/BlazeDirectories.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java') diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java index a1094a6bda..6fa762df89 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java @@ -15,6 +15,7 @@ package com.google.devtools.build.lib.analysis; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Strings; import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; import com.google.devtools.build.lib.Constants; @@ -75,7 +76,8 @@ public final class BlazeDirectories { this.installBase = installBase; this.workspace = workspace; this.outputBase = outputBase; - this.installMD5 = installMD5 == null ? null : checkMD5(HashCode.fromString(installMD5)); + this.installMD5 = + Strings.isNullOrEmpty(installMD5) ? null : checkMD5(HashCode.fromString(installMD5)); boolean useDefaultExecRootName = this.workspace == null || this.workspace.isRootDirectory(); Path execRootBase = deepExecRoot ? outputBase.getChild("execroot") : outputBase; -- cgit v1.2.3