Commit d4ab59fc authored by Nico Weber's avatar Nico Weber Committed by Chromium LUCI CQ

mac: Simplify copy_bundle_data command.

By now all builders are on 10.15 and should all be on APFS.
Also, we basically require the build dir to be below the src dir,
so they're going to always be on the same disk in practice.

Since we rm the dest dir right before the cp, no need to pass `-f`
either.

Bug: 1042182,1064586
Change-Id: Ia24ad28d475b2611a0f17442fe421f38875c586b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2605869
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839750}
parent 3b8491ce
......@@ -444,10 +444,7 @@ template("mac_toolchain") {
# Instead use clonefile to copy the files which is as efficient as
# hardlink but ensure the file have distinct metadata (thus avoid the
# error with ditto, see https://crbug.com/1042182).
command =
"rm -rf {{output}} && cp -fRc {{source}} {{output}} 2>/dev/null " +
"|| (rm -rf {{output}} && cp -fR {{source}} {{output}})"
command = "rm -rf {{output}} && cp -Rc {{source}} {{output}}"
description = "COPY_BUNDLE_DATA {{source}} {{output}}"
pool = ":bundle_pool($default_toolchain)"
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment