diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 03:39:46 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 03:39:46 +0000 |
| commit | 3e5c92b78482cc7236e97f8de99247d5b4497651 (patch) | |
| tree | e021eb45e6b2c724f34dbae2748652243198ac70 /native_client_sdk | |
| parent | d5f48b87982e8a403a7b6bf669b471c67f0d8cfe (diff) | |
| download | chromium_src-3e5c92b78482cc7236e97f8de99247d5b4497651.zip chromium_src-3e5c92b78482cc7236e97f8de99247d5b4497651.tar.gz chromium_src-3e5c92b78482cc7236e97f8de99247d5b4497651.tar.bz2 | |
[NaCl SDK] Ignore NACL_SDK_ROOT env var when building SDK.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11361107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index f9c801f..97e488e 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -961,6 +961,11 @@ def main(args): pepper_ver = options.release print 'Building PEPPER %s at %s' % (pepper_ver, clnumber) + if 'NACL_SDK_ROOT' in os.environ: + # We don't want the currently configured NACL_SDK_ROOT to have any effect + # of the build. + del os.environ['NACL_SDK_ROOT'] + if options.only_examples: BuildStepCopyExamples(pepperdir, toolchains, options.build_experimental, options.clobber_examples) |