diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 16:12:19 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 16:12:19 +0000 |
| commit | d23ca4a6f6d910a9ccbbbd7beb1469f62241914e (patch) | |
| tree | 35c2154909e1467228c7ee4e880bb2488122efd5 /chrome/nacl.gypi | |
| parent | a5773a73b783857aa623bcbef47c5aad33c25b40 (diff) | |
| download | chromium_src-d23ca4a6f6d910a9ccbbbd7beb1469f62241914e.zip chromium_src-d23ca4a6f6d910a9ccbbbd7beb1469f62241914e.tar.gz chromium_src-d23ca4a6f6d910a9ccbbbd7beb1469f62241914e.tar.bz2 | |
Don't build NaCl's syscall handler into a shared library
Fixes shared library Chromium build on x86-64 on Linux.
BUG=35829
TEST=build
Review URL: http://codereview.chromium.org/652109
Patch from mseaborn@.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index d142af7..1858f97 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, |