Skip to content

Commit

Permalink
[NaCl SDK] Add option to not use sysroot in build
Browse files Browse the repository at this point in the history
BUG=491175
R=sbc@chromium.org

Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>

Review URL: https://codereview.chromium.org/1153793002

Cr-Commit-Position: refs/heads/master@{#331281}
  • Loading branch information
eduardo.lima authored and Commit bot committed May 25, 2015
1 parent d2d2a22 commit 862ed27
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions native_client_sdk/src/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@

Google Inc. native-client-discuss@google.com
Daiwei Li <daiweili@suitabletech.com>
Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
Matthew Turk <matthewturk@gmail.com>
Soeren Balko <soeren@zfaas.com>
5 changes: 4 additions & 1 deletion native_client_sdk/src/build_tools/build_sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,8 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets,
gyp_env['GYP_GENERATORS'] = 'ninja'
gyp_defines = gyp_defines or []
gyp_defines.append('nacl_allow_thin_archives=0')
gyp_defines.append('use_sysroot=1')
if not options.no_use_sysroot:
gyp_defines.append('use_sysroot=1')
if options.mac_sdk:
gyp_defines.append('mac_sdk=%s' % options.mac_sdk)

Expand Down Expand Up @@ -999,6 +1000,8 @@ def main(args):
help='Set the mac-sdk (e.g. 10.6) to use when building with ninja.')
parser.add_argument('--no-arm-trusted', action='store_true',
help='Disable building of ARM trusted components (sel_ldr, etc).')
parser.add_argument('--no-use-sysroot', action='store_true',
help='Disable building against sysroot.')

# To setup bash completion for this command first install optcomplete
# and then add this line to your .bashrc:
Expand Down

0 comments on commit 862ed27

Please sign in to comment.