lib/naclports/source_package.py - Issue 1393343002: Improve emscripten download, install and auto-detection

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: lib/naclports/source_package.py

Issue 1393343002: Improve emscripten download, install and auto-detection (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master

Patch Set: Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: lib/naclports/source_package.py

diff --git a/lib/naclports/source_package.py b/lib/naclports/source_package.py

index 8e6440a0e66e684dedeed28bf84f26b592421751..c4727e9463eb2a758f2273a50cdc7b52c81c42fb 100644

--- a/lib/naclports/source_package.py

+++ b/lib/naclports/source_package.py

@@ -376,13 +376,13 @@ class SourcePackage(package.Package):

build_port = os.path.join(paths.TOOLS_DIR, 'build_port.sh')

cmd = [build_port]

+ if self.config.toolchain == 'emscripten':

+ util.SetupEmscripten()

env = os.environ.copy()

env['TOOLCHAIN'] = self.config.toolchain

env['NACL_ARCH'] = self.config.arch

env['NACL_DEBUG'] = self.config.debug and '1' or '0'

env['NACL_SDK_ROOT'] = util.GetSDKRoot()

- if self.config.toolchain == 'emscripten':

- env['EMSCRIPTEN'] = util.GetEmscriptenRoot()

rtn = subprocess.call(cmd,

stdout=sys.stdout,

stderr=sys.stderr,

« no previous file with comments | « build_tools/download_emscripten.py ('k') | lib/naclports/util.py » ('j') | no next file with comments »