diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-03 04:51:00 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-03 04:51:00 +0000 |
| commit | 404b9863075145cde48e00b47169e3d0446266b6 (patch) | |
| tree | e027cb14e3e099f42838e860cb196438940d7dfb /tools/gn/setup.cc | |
| parent | 3f2358ec87d2422c790b75e000d4771288089018 (diff) | |
| download | chromium_src-404b9863075145cde48e00b47169e3d0446266b6.zip chromium_src-404b9863075145cde48e00b47169e3d0446266b6.tar.gz chromium_src-404b9863075145cde48e00b47169e3d0446266b6.tar.bz2 | |
Revert 232657 "GN: toolchain threading cleanup"
Broke linux clang bots:
../../tools/gn/ninja_helper_unittest.cc:20:9:error: field 'settings' will be initialized after field 'toolchain' [-Werror,-Wreorder]
This happened on your try jobs too.
> 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
>
> Review URL: https://codereview.chromium.org/51693002
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/46313006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/setup.cc')
| -rw-r--r-- | tools/gn/setup.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gn/setup.cc b/tools/gn/setup.cc index 47a243a..8bce9b5 100644 --- a/tools/gn/setup.cc +++ b/tools/gn/setup.cc @@ -202,9 +202,9 @@ bool CommonSetup::RunPostMessageLoop() { Setup::Setup() : CommonSetup(), - empty_settings_(&empty_build_settings_, std::string()), + empty_toolchain_(Label()), + empty_settings_(&empty_build_settings_, &empty_toolchain_, std::string()), dotfile_scope_(&empty_settings_) { - empty_settings_.set_toolchain_label(Label()); } Setup::~Setup() { |