diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-04 19:19:59 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-04 19:19:59 +0000 |
| commit | 132715e1e82b1f69fc5a67d3acedb24c12d02e2a (patch) | |
| tree | d439dd489e8f11e40e9161c5e45188f62ff2d1e6 /tools/gn/input_conversion.cc | |
| parent | 21bb906f7ce89a54bf8ecdb951771bb25069e43c (diff) | |
| download | chromium_src-132715e1e82b1f69fc5a67d3acedb24c12d02e2a.zip chromium_src-132715e1e82b1f69fc5a67d3acedb24c12d02e2a.tar.gz chromium_src-132715e1e82b1f69fc5a67d3acedb24c12d02e2a.tar.bz2 | |
GN: toolchain threading cleanup
Remove the thread-unsafe toolchain pointer on the otherwise-threadsafe Settings object. I replaced it with the toolchain label, and moved the is_default flag from the toolchain to the Settings object.
This required that I pass the toolchain around in a few more places, but also simplifies some other cases.
I removed the toolchain prefix from Ninja rules for the default toolchain since that's not necessary any more for GYP compat.
This fixes an annoying double-free in the toolchain manager. I think my current refactor will clean this up in a later phase.
R=scottmg@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=232657
Review URL: https://codereview.chromium.org/51693002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/input_conversion.cc')
| -rw-r--r-- | tools/gn/input_conversion.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/gn/input_conversion.cc b/tools/gn/input_conversion.cc index 19a8047..c40bdba 100644 --- a/tools/gn/input_conversion.cc +++ b/tools/gn/input_conversion.cc @@ -117,9 +117,7 @@ Value ParseString(const std::string& input, } BuildSettings build_settings; - Label empty_label; - Toolchain toolchain(empty_label); - Settings settings(&build_settings, &toolchain, std::string()); + Settings settings(&build_settings, std::string()); Scope scope(&settings); Err nested_err; |