Index: chrome/nacl.gypi |
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi |
index d142af7efa9640f1d4b996d0ea127e86dfbf0384..1858f970833b78b260fad47d241db674d89bc4ea 100644 |
--- a/chrome/nacl.gypi |
+++ b/chrome/nacl.gypi |
@@ -47,7 +47,10 @@ |
'targets': [ |
{ |
'target_name': 'nacl', |
- 'type': '<(library)', |
+ # 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': { |
'nacl_target': 1, |