diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 22:05:06 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 22:05:06 +0000 |
| commit | fdf928a874a787fff8f83e7309b06b0babac2561 (patch) | |
| tree | 1facdf501b5e43e5f63e8c186bd599d3c2297ed3 /native_client_sdk/src/build_tools | |
| parent | b88869c56537b39b64117b059985134be8fa3396 (diff) | |
| download | chromium_src-fdf928a874a787fff8f83e7309b06b0babac2561.zip chromium_src-fdf928a874a787fff8f83e7309b06b0babac2561.tar.gz chromium_src-fdf928a874a787fff8f83e7309b06b0babac2561.tar.bz2 | |
[NaCl SDK] Fix Pnacl build.
Also, "./build_sdk --pnacl" now works on non-buildbots.
BUG=none
TEST=none
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/10767002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/build_tools')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 6 | ||||
| -rwxr-xr-x | native_client_sdk/src/build_tools/make_rules.py | 2 |
2 files changed, 7 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 0df2c55..1d2923c 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -446,6 +446,12 @@ def main(args): if builder_name.find('pnacl') >= 0 and builder_name.find('sdk') >= 0: options.pnacl = True + # TODO(binji) There is currently a hack in download_nacl_toolchains.py that + # won't download pnacl toolchains unless the BUILDBOT_BUILDERNAME has "pnacl" + # and "sdk" in it. Set that here, if not already set... + if options.pnacl and not os.getenv('BUILDBOT_BUILDERNAME'): + os.environ['BUILDBOT_BUILDERNAME'] = 'pnacl-sdk' + # TODO(binji) for now, only test examples on non-trybots. Trybots don't build # pyauto Chrome. if buildbot_common.IsSDKBuilder(): diff --git a/native_client_sdk/src/build_tools/make_rules.py b/native_client_sdk/src/build_tools/make_rules.py index 4d8f2c9..5531dcb 100755 --- a/native_client_sdk/src/build_tools/make_rules.py +++ b/native_client_sdk/src/build_tools/make_rules.py @@ -207,7 +207,7 @@ BUILD_RULES = { 'DEFS': PNACL_DEFAULTS, 'CC': NACL_CC_RULE, 'CXX': NACL_CC_RULE, - 'nmf' : NMF_RULE, + 'NMF' : NMF_RULE, 'MAIN': PEXE_LINK_RULE, 'LIB': None, 'SO': None, |