summaryrefslogtreecommitdiffstats
path: root/o3d/plugin
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 21:58:43 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 21:58:43 +0000
commitc60b71c744aaa665589e008f605e396903ce3199 (patch)
treeb2e0b49af1887ab1b4a8ad9364eb42b159f53fe5 /o3d/plugin
parent33ef09be5f4fa2da87b994f4b315d9f03d82362e (diff)
downloadchromium_src-c60b71c744aaa665589e008f605e396903ce3199.zip
chromium_src-c60b71c744aaa665589e008f605e396903ce3199.tar.gz
chromium_src-c60b71c744aaa665589e008f605e396903ce3199.tar.bz2
Linux: Link the O3D browser plugin with -z nodelete.
BUG=25245 TEST=Install O3D plugin for 32-bit Chrome, visit about:plugins, shutdown Chrome. This should not result in a crash. Review URL: http://codereview.chromium.org/402092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
-rw-r--r--o3d/plugin/plugin.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp
index c128c70..9ea6e00 100644
--- a/o3d/plugin/plugin.gyp
+++ b/o3d/plugin/plugin.gyp
@@ -201,6 +201,10 @@
'linux/config.cc',
'linux/envvars.cc',
],
+ 'ldflags': [
+ '-z',
+ 'nodelete',
+ ],
'link_settings': {
'libraries': [
'-lGL',