Non-SFI Mode: Build ipc/ library by PNaCl toolchain for nacl_helper_nonsfi.

ipc/ipc_nacl.gyp

Index: ipc/ipc_nacl.gyp
diff --git a/ipc/ipc_nacl.gyp b/ipc/ipc_nacl.gyp
index 3119f46cae1bf1a038ca94389694697c2d9cfc79..9ba17dfa6f8e27d6cd69e9fe55b034e054af948a 100644
--- a/ipc/ipc_nacl.gyp
+++ b/ipc/ipc_nacl.gyp
@@ -25,8 +25,41 @@
             'build_irt': 1,
           },
           'dependencies': [
-            '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
             '../base/base_nacl.gyp:base_nacl',
+            '../native_client/tools.gyp:prep_toolchain',
+          ],
+        },
+        {
+          'target_name': 'ipc_nacl_nonsfi',
+          'type': 'none',
+          'include_dirs': [
+            '../native_client/src/public/linux_syscalls',

[Mark Seaborn, 2014/10/23 03:33:48]

BTW, I think the DEPS roll has landed that means this isn't required any more.

[hidehiko, 2014/10/23 14:19:10]

Done.

+          ],
+          'variables': {
+            'ipc_target': 1,
+            'nacl_untrusted_build': 1,
+            'nlib_target': 'libipc_nacl_nonsfi.a',
+            'build_glibc': 0,
+            'build_newlib': 0,
+            'build_irt': 0,
+            'build_pnacl_newlib': 0,
+            'build_nonsfi_helper': 1,
+
+            # Use linux IPC channel implementation for nacl_helper_nonsfi,
+            # instead of NaCl's IPC implementation (ipc_channel_nacl.cc),
+            # because nacl_helper_nonsfi will be running directory on Linux.

[Mark Seaborn, 2014/10/23 03:33:48]

"directly on Linux"

[hidehiko, 2014/10/23 14:19:10]

Oops... Fixed.

+            # ipc_channel_nacl.cc is excluded below.
+            'sources': [
+              'ipc_channel.cc',
+              'ipc_channel_posix.cc',
+            ],
+          },
+          'sources!': [
+            'ipc_channel_nacl.cc',
+          ],
+          'dependencies': [
+            '../base/base_nacl.gyp:base_nacl_nonsfi',
+            '../native_client/tools.gyp:prep_toolchain',
           ],
         },
       ],