diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 10:33:46 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 10:33:46 +0000 |
| commit | 7d51a725ae8963b801e460d8ac783079c6c0e5e3 (patch) | |
| tree | 67587195e12192ec29e60939d93c956f8678b156 /third_party/mesa | |
| parent | 7dc1ffbd5b5027f683b616a4c605f6c8c07e6fe4 (diff) | |
| download | chromium_src-7d51a725ae8963b801e460d8ac783079c6c0e5e3.zip chromium_src-7d51a725ae8963b801e460d8ac783079c6c0e5e3.tar.gz chromium_src-7d51a725ae8963b801e460d8ac783079c6c0e5e3.tar.bz2 | |
Disambiguate 'headers' targets in khronos and mesa.
I suspect that the target name collision is causing compile failures on Win (e.g. http://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/4176/steps/compile/logs/stdio)
BUG=none
TBR=jochen@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/11412217
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169895 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa')
| -rw-r--r-- | third_party/mesa/mesa.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index 2e8308c..5334e52 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -39,7 +39,7 @@ }, 'targets': [ { - 'target_name': 'headers', + 'target_name': 'mesa_headers', 'type': 'none', 'direct_dependent_settings': { 'include_dirs': [ @@ -58,7 +58,7 @@ 'MesaLib/src/mesa/main', ], 'dependencies': [ - 'headers', + 'mesa_headers', ], 'sources': [ '../talloc/talloc.c', @@ -560,7 +560,7 @@ 'type': 'loadable_module', 'mac_bundle': 0, 'dependencies': [ - 'headers', + 'mesa_headers', 'mesa', ], # Fixes link problems on Mac OS X with missing __cxa_pure_virtual. @@ -590,7 +590,7 @@ 'targets': [ # TODO(phajdan.jr): Make this work, http://crbug.com/161389 . { - 'target_name': 'headers', + 'target_name': 'mesa_headers', 'type': 'none', }, { |