diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 20:13:57 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 20:13:57 +0000 |
| commit | fd36ce82ca04c8ed09f9b6fc519cb000ad529b3f (patch) | |
| tree | 0910724e0623d076a50ca676caef56e0708ceaec /third_party | |
| parent | 2329792307deebd09cf0b79bda7dfeffae61c715 (diff) | |
| download | chromium_src-fd36ce82ca04c8ed09f9b6fc519cb000ad529b3f.zip chromium_src-fd36ce82ca04c8ed09f9b6fc519cb000ad529b3f.tar.gz chromium_src-fd36ce82ca04c8ed09f9b6fc519cb000ad529b3f.tar.bz2 | |
This does a few things:
- only include cflags/linkflags and other compiler settings that are target-specific when building for 'target'
- make build tools (protoc) compile for 'host', and change the dependencies on them to reflect that.
Review URL: http://codereview.chromium.org/265031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30381 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/protobuf2/protobuf.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/protobuf2/protobuf.gyp b/third_party/protobuf2/protobuf.gyp index 18fdcd4..7b6d0db 100644 --- a/third_party/protobuf2/protobuf.gyp +++ b/third_party/protobuf2/protobuf.gyp @@ -38,6 +38,7 @@ { 'target_name': 'protobuf_lite', 'type': '<(library)', + 'toolsets': ['host', 'target'], 'sources': [ 'src/src/google/protobuf/stubs/common.h', 'src/src/google/protobuf/stubs/once.h', @@ -92,6 +93,7 @@ { 'target_name': 'protobuf', 'type': '<(library)', + 'toolsets': ['host'], 'sources': [ 'src/src/google/protobuf/descriptor.h', 'src/src/google/protobuf/descriptor.pb.h', @@ -149,6 +151,7 @@ { 'target_name': 'protoc', 'type': 'executable', + 'toolsets': ['host'], 'sources': [ 'src/src/google/protobuf/compiler/code_generator.cc', 'src/src/google/protobuf/compiler/command_line_interface.cc', |