Merge 100031 - Modify the build recipe for nacl_helper_bootstrap to invoke the linker explicitly ...

chrome/chrome_exe.gypi

Index: chrome/chrome_exe.gypi
===================================================================
--- chrome/chrome_exe.gypi	(revision 102300)
+++ chrome/chrome_exe.gypi	(working copy)
@@ -452,6 +452,17 @@
             '../third_party/adobe/flash/flash_player.gyp:flash_player',
           ],
         }],
+        ['OS=="linux"', {
+          'conditions': [
+            # For now, do not build nacl_helper on ARM or when disable_nacl=1
+            ['disable_nacl!=1 and target_arch!="arm"', {
+              'dependencies': [
+                'nacl_helper_bootstrap',
+                'nacl_helper',
+                ],
+            }],
+          ],
+        }],
         ['OS=="mac"', {
           'dependencies': [
             # On Mac, make sure we've built chrome_dll, which contains all of