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

Unified Diff: tools/gn/function_set_default_toolchain.cc

Issue 630223002: gn: Support build directories outside the source tree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: tools/gn/function_set_default_toolchain.cc
diff --git a/tools/gn/function_set_default_toolchain.cc b/tools/gn/function_set_default_toolchain.cc
index 1eb5ee09b818ffa26334a9cb61b56d7e0dbddecb..08b9d12251b14fa98b36e190f9b2edb3fd879ce4 100644
--- a/tools/gn/function_set_default_toolchain.cc
+++ b/tools/gn/function_set_default_toolchain.cc
@@ -67,7 +67,8 @@ Value RunSetDefaultToolchain(Scope* scope,
if (!EnsureSingleStringArg(function, args, err))
return Value();
Label toolchain_label(
- Label::Resolve(current_dir, default_toolchain, args[0], err));
+ Label::Resolve(current_dir, default_toolchain, args[0],
+ scope->settings()->build_settings()->root_path(), err));
if (toolchain_label.is_null())
return Value();

Powered by Google App Engine
This is Rietveld 408576698