diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java index 0f73a413d97bde..1f2b1c104a9dcc 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxModule.java @@ -126,6 +126,10 @@ private static Path computeSandboxBase(SandboxOptions options, CommandEnvironmen env.getRuntime().getProductName(), Fingerprint.getHexDigest(env.getOutputBase().toString())); FileSystem fileSystem = env.getRuntime().getFileSystem(); + if (OS.getCurrent() == OS.DARWIN) { + // Don't resolve symlinks on macOS: See https://github.com/bazelbuild/bazel/issues/13766 + return fileSystem.getPath(options.sandboxBase).getRelative(dirName); + } Path resolvedSandboxBase = fileSystem.getPath(options.sandboxBase).resolveSymbolicLinks(); return resolvedSandboxBase.getRelative(dirName); }