Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Unified Diff: update_depot_tools

Issue 141523009: Update update_depot_tools to always check out Windows tools on Cygwin. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: update_depot_tools
diff --git a/update_depot_tools b/update_depot_tools
index a146724ff163e94340ba3d4910956a28c4f29a24..4320fdbbd979450f9f6ae1eddc757445ba2b5d60 100755
--- a/update_depot_tools
+++ b/update_depot_tools
@@ -17,6 +17,13 @@ then
base_dir=`cd "$base_dir" && pwd -P`
fi
+# Don't try to use Cygwin tools. Get real win32 tools using the batch script.
+OUTPUT="$(uname | grep 'CYGWIN')"
+CYGWIN=$?
+if [ $CYGWIN = 0 ]; then
+ cmd /c `cygpath -w "$base_dir/bootstrap/win/win_tools.bat"` force
+fi
+
# Test if this script is running under a MSys install. If it is, we will
# hardcode the paths to SVN and Git where possible.
OUTPUT="$(uname | grep 'MINGW')"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698