diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 01:28:43 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 01:28:43 +0000 |
| commit | 8ca64d42684fa5d7304805a9225f6880a5cb2fa6 (patch) | |
| tree | 4f217adcf0098da65f1b5d242d240fadad5374f4 /native_client_sdk | |
| parent | 549cc51caac81fa803d3a58845110fbdceb76246 (diff) | |
| download | chromium_src-8ca64d42684fa5d7304805a9225f6880a5cb2fa6.zip chromium_src-8ca64d42684fa5d7304805a9225f6880a5cb2fa6.tar.gz chromium_src-8ca64d42684fa5d7304805a9225f6880a5cb2fa6.tar.bz2 | |
[NaCl SDK] Add option to build_sdk to set mac_sdk.
I need this to run build_sdk on my mac running 10.8.
BUG=none
TBR=noelallen@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11366234
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 52a5c16..3b6e884 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -479,8 +479,13 @@ def GypNinjaBuild_Pnacl(rel_out_dir, target_arch): def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir): gyp_env = copy.copy(os.environ) gyp_env['GYP_GENERATORS'] = 'ninja' + gyp_defines = [] + if options.mac_sdk: + gyp_defines.append('mac_sdk=%s' % options.mac_sdk) if arch: - gyp_env['GYP_DEFINES'] = 'target_arch=%s' % (arch,) + gyp_defines.append('target_arch=%s' % arch) + + gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines) gyp_generator_flags = ['-G', 'output_dir=%s' % (out_dir,)] gyp_depth = '--depth=.' buildbot_common.Run( @@ -934,6 +939,9 @@ def main(args): dest='build_experimental', default=False) parser.add_option('--skip-toolchain', help='Skip toolchain download/untar', action='store_true', dest='skip_toolchain', default=False) + parser.add_option('--mac_sdk', + help='Set the mac_sdk (e.g. 10.6) to use when building with ninja.', + dest='mac_sdk') global options options, args = parser.parse_args(args[1:]) |