diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 22:58:02 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 22:58:02 +0000 |
commit | b1e468fff539bd050302b9154db2aee8bad1a696 (patch) | |
tree | b118b5288e8c632abac183e10c915feca6b3054a /tools/gn/target.cc | |
parent | 8f2543b816cf6a0f51d97d8060db2a0632e730f7 (diff) | |
download | chromium_src-b1e468fff539bd050302b9154db2aee8bad1a696.zip chromium_src-b1e468fff539bd050302b9154db2aee8bad1a696.tar.gz chromium_src-b1e468fff539bd050302b9154db2aee8bad1a696.tar.bz2 |
Remove nss hack in chrome.
This does more correct dependencies and flags for linking NSS into Chrome.
It adds buildfiles for skia. The library compiles on Linux but likely not other systems at this point and is still a bit of a mess.
Defines are now escaped properly so you can have quotes in defined values (this was needed for Skia).
This adds a describe command for printing out the applying ld flags, and removes duplicates earlier using a new OrderedSet container.
BUG=
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/23480042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/target.cc')
-rw-r--r-- | tools/gn/target.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/gn/target.cc b/tools/gn/target.cc index e196c7a..5616aea 100644 --- a/tools/gn/target.cc +++ b/tools/gn/target.cc @@ -141,8 +141,7 @@ void Target::OnResolved() { // all of our configs. We do this for ldflags because it must get inherited // through the dependency tree (other flags don't work this way). for (ConfigValuesIterator iter(this); !iter.done(); iter.Next()) { - all_ldflags_.insert(all_ldflags_.end(), - iter.cur().ldflags().begin(), + all_ldflags_.append(iter.cur().ldflags().begin(), iter.cur().ldflags().end()); } @@ -200,8 +199,7 @@ void Target::PullDependentTargetInfo(std::set<const Config*>* unique_configs) { inherited_libraries_.insert(*i); // Inherited system libraries. - all_ldflags_.insert(all_ldflags_.end(), - dep->all_ldflags().begin(), dep->all_ldflags().end()); + all_ldflags_.append(dep->all_ldflags()); } } |