| Index: chrome/nacl.gypi
|
| diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
|
| index 84da264cc716dbfb452adb722e77878853d27ab4..031147dad3e76efb15d28df0790e5a04cb363ca2 100644
|
| --- a/chrome/nacl.gypi
|
| +++ b/chrome/nacl.gypi
|
| @@ -53,9 +53,6 @@
|
| 'targets': [
|
| {
|
| 'target_name': 'nacl',
|
| - # The TLS (Thread Local Storage) access used by NaCl on x86-64
|
| - # on Linux/ELF can't be linked into a shared library, so we
|
| - # can't use '<(library)' here. See http://crbug.com/35829.
|
| 'type': 'static_library',
|
| 'msvs_guid': '83E86DAF-5763-4711-AD34-5FDAE395560C',
|
| 'variables': {
|
| @@ -97,7 +94,7 @@
|
| 'targets': [
|
| {
|
| 'target_name': 'nacl_win64',
|
| - 'type': '<(library)',
|
| + 'type': 'static_library',
|
| 'msvs_guid': '14135464-9FB9-42E3-99D8-791116FA1204',
|
| 'variables': {
|
| 'nacl_target': 1,
|
|
|