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

Unified Diff: mojo/tools/mojob.sh

Issue 663023006: Mojo: mojob.sh: Make --release (etc.) work properly again. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: back to v1 Created 6 years, 2 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: mojo/tools/mojob.sh
diff --git a/mojo/tools/mojob.sh b/mojo/tools/mojob.sh
index 7092c791f696995a5e2109b721a7f6a375404b56..f1c5d6efacb5757b64c7033d98817a0d6152747b 100755
--- a/mojo/tools/mojob.sh
+++ b/mojo/tools/mojob.sh
@@ -101,9 +101,20 @@ COMPILER=clang
GOMA=auto
make_gn_args() {
local args=()
+ # TODO(vtl): It's a bit of a hack to infer the build type from the output
+ # directory name, but it's what we have right now (since we support "debug and
+ # release" mode).
+ case "$1" in
+ Debug)
+ # (Default.)
+ ;;
+ Release)
+ args+=("is_debug=false")
+ ;;
+ esac
case "$COMPILER" in
clang)
- args+=("is_clang=true")
+ # (Default.)
;;
gcc)
args+=("is_clang=false")
@@ -116,11 +127,11 @@ make_gn_args() {
elif [ -d "${HOME}/goma" ]; then
args+=("use_goma=true" "goma_dir=\"${HOME}/goma\"")
else
- args+=("use_goma=false")
+ : # (Default.)
fi
;;
disabled)
- args+=("use_goma=false")
+ # (Default.)
;;
esac
echo "${args[*]}"
« 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