Index: chrome/installer/mac/dirdiffer.sh |
diff --git a/chrome/installer/mac/dirdiffer.sh b/chrome/installer/mac/dirdiffer.sh |
index 2e819289d713b3f2796be50efce391c3c81ce6e8..cd8f673fe033ffe21095925b0b2e84a046c23d4e 100755 |
--- a/chrome/installer/mac/dirdiffer.sh |
+++ b/chrome/installer/mac/dirdiffer.sh |
@@ -106,7 +106,7 @@ shopt -s dotglob nullglob |
# find_tool looks for an executable file named |tool_name|: |
# - in the same directory as this script, |
# - if this script is located in a Chromium source tree, at the expected |
-# Release output location in the Mac xcodebuild directory, |
+# Release output location in the Mac out directory, |
# - as above, but in the Debug output location |
# If found in any of the above locations, the script's path is output. |
# Otherwise, this function outputs |tool_name| as a fallback, allowing it to |
@@ -126,13 +126,13 @@ find_tool() { |
local script_dir_phys |
script_dir_phys="$(cd "${script_dir}" && pwd -P)" |
if [[ "${script_dir_phys}" =~ ^(.*)/src/chrome/installer/mac$ ]]; then |
- tool="${BASH_REMATCH[1]}/src/xcodebuild/Release/${tool_name}" |
+ tool="${BASH_REMATCH[1]}/src/out/Release/${tool_name}" |
Mark Mentovai
2013/10/25 12:58:19
You can make this check the ninja locations, and i
Nico
2013/10/25 14:14:45
I had this at first (see diff from patch set 1 to
|
if [[ -f "${tool}" ]] && [[ -x "${tool}" ]]; then |
echo "${tool}" |
return |
fi |
- tool="${BASH_REMATCH[1]}/src/xcodebuild/Debug/${tool_name}" |
+ tool="${BASH_REMATCH[1]}/src/out/Debug/${tool_name}" |
if [[ -f "${tool}" ]] && [[ -x "${tool}" ]]; then |
echo "${tool}" |
return |