[NaCl SDK] Compile for naclio for Bionic

native_client_sdk/src/build_tools/build_projects.py

Index: native_client_sdk/src/build_tools/build_projects.py
diff --git a/native_client_sdk/src/build_tools/build_projects.py b/native_client_sdk/src/build_tools/build_projects.py
index 11cc455ebfbca68d45b20683f41ac41f5a8b269e..a41938077de0939f752b3edd174e748e2a6cef66 100755
--- a/native_client_sdk/src/build_tools/build_projects.py
+++ b/native_client_sdk/src/build_tools/build_projects.py
@@ -29,6 +29,7 @@ LIB_DICT = {
   'mac': [],
   'win': ['x86_32']
 }
+

[Sam Clegg, 2014/03/27 00:10:02]

Extra newline here for some reason?

[noelallen1, 2014/03/27 18:13:48]

Done.

 VALID_TOOLCHAINS = [
   'bionic',
   'newlib',
@@ -185,6 +186,7 @@ def BuildProjectsBranch(pepperdir, branch, deps, clean, config, args=None):
   make_cmd = [make, '-j', jobs]
 
   make_cmd.append('CONFIG='+config)
+  make_cmd.append('ENABLE_BIONIC=1')

[Sam Clegg, 2014/03/27 00:10:02]

Is it OK to add this unconditionally?

[noelallen1, 2014/03/27 18:13:48]

Yes, every project we provide overrides the VALID_TOOLCHAINS

ifneq ($(ENABLE_BIONIC),)
ALL_TOOLCHAINS ?= pnacl newlib glibc bionic
else
ALL_TOOLCHAINS ?= pnacl newlib glibc
endif

...

So for some example:
VALID_TOOLCHAINS := newlib glibc pnacl linux

#
# The target for all versions
#
USABLE_TOOLCHAINS=$(filter $(OSNAME) $(ALL_TOOLCHAINS), $(VALID_TOOLCHAINS))

If bionic is not enabled, then the project generator will not add bionic to the
list of possible targets.

   if not deps:
     make_cmd.append('IGNORE_DEPS=1')
 
@@ -224,6 +226,8 @@ def main(argv):
   parser.add_option('--config',
       help='Choose configuration to build (Debug or Release).  Builds both '
            'by default')
+  parser.add_option('--bionic',
+      help='Enable bionic projects', action='store_true')
   parser.add_option('-x', '--experimental',
       help='Build experimental projects', action='store_true')
   parser.add_option('-t', '--toolchain',
@@ -259,7 +263,7 @@ def main(argv):
     # e.g. If an example supports newlib and glibc, then the default will be
     # newlib.
     options.toolchain = ['pnacl', 'newlib', 'glibc', 'host']
-    if options.experimental:
+    if options.experimental or options.bionic:
       options.toolchain.append('bionic')
 
   if 'host' in options.toolchain: