summaryrefslogtreecommitdiffstats
path: root/tools/gn/toolchain.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 21:11:06 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 21:11:06 +0000
commit4441041bed1422a1b0a785068b5049b29730ce47 (patch)
treec6764c4201506750d50a09e847422a8bae26d811 /tools/gn/toolchain.cc
parentddf48eac85c977e2098139ee5dd79d5ad56828d1 (diff)
downloadchromium_src-4441041bed1422a1b0a785068b5049b29730ce47.zip
chromium_src-4441041bed1422a1b0a785068b5049b29730ce47.tar.gz
chromium_src-4441041bed1422a1b0a785068b5049b29730ce47.tar.bz2
Add support for data deps.
Data deps are non-linked dependencies of a target. They are built in parallel (they are not input dependencies). I redefined "data" to mean data file dependencies, and added a new "datadeps" contept for non-linked target dependencies. Fix a bug to make it not crash if there's nothing to generate. Add variable documentation for some vars. Removed support for some builtin vars "root output dir name" and related. These had changed definition from when I originally wrote them, and I don't think there's any use for these values. We can add them back if we need. I moved the variable name constant declarations from scope_per_file_provider to the new variables file which includes documentation. I added support for getting the name of the current toolchain via a builtin variable. I removed support for solink_module which is not necessary. This was a way to express a .dll target that isn't linked to its dependees, but that's no longer necessary for datadeps. BUG= R=scottmg@chromium.org Review URL: https://codereview.chromium.org/22290010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/toolchain.cc')
-rw-r--r--tools/gn/toolchain.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/gn/toolchain.cc b/tools/gn/toolchain.cc
index 23da1e7..d906b9a 100644
--- a/tools/gn/toolchain.cc
+++ b/tools/gn/toolchain.cc
@@ -13,7 +13,6 @@ const char* Toolchain::kToolObjCxx = "objcxx";
const char* Toolchain::kToolAsm = "asm";
const char* Toolchain::kToolAlink = "alink";
const char* Toolchain::kToolSolink = "solink";
-const char* Toolchain::kToolSolinkModule = "solink_module";
const char* Toolchain::kToolLink = "link";
const char* Toolchain::kToolStamp = "stamp";
const char* Toolchain::kToolCopy = "copy";
@@ -47,7 +46,6 @@ Toolchain::ToolType Toolchain::ToolNameToType(const base::StringPiece& str) {
if (str == kToolAsm) return TYPE_ASM;
if (str == kToolAlink) return TYPE_ALINK;
if (str == kToolSolink) return TYPE_SOLINK;
- if (str == kToolSolinkModule) return TYPE_SOLINK_MODULE;
if (str == kToolLink) return TYPE_LINK;
if (str == kToolStamp) return TYPE_STAMP;
if (str == kToolCopy) return TYPE_COPY;
@@ -64,7 +62,6 @@ std::string Toolchain::ToolTypeToName(ToolType type) {
case TYPE_ASM: return kToolAsm;
case TYPE_ALINK: return kToolAlink;
case TYPE_SOLINK: return kToolSolink;
- case TYPE_SOLINK_MODULE: return kToolSolinkModule;
case TYPE_LINK: return kToolLink;
case TYPE_STAMP: return kToolStamp;
case TYPE_COPY: return kToolCopy;