mojo/go/go.py - Issue 1276653003: Update version of Go to 1.5

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: mojo/go/go.py

Issue 1276653003: Update version of Go to 1.5 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: go.mobile no longer needed Created 5 years, 4 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:

Index: mojo/go/go.py

diff --git a/mojo/go/go.py b/mojo/go/go.py

index 0b84e685dd6fecfd3ec0bd9f7c0c21ff4ed91791..a0f93f213e2bda88fdcff9351885d96b56f5c7fd 100755

--- a/mojo/go/go.py

+++ b/mojo/go/go.py

@@ -78,6 +78,8 @@ def main():

ndk_cc = os.path.join(ndk_path, 'toolchains', NDK_TOOLCHAIN,

'prebuilt', arch, 'bin', 'arm-linux-androideabi-gcc')

sysroot = os.path.join(ndk_path, 'platforms', NDK_PLATFORM, 'arch-arm')

+ env['CGO_CFLAGS'] += ' --sysroot %s' % sysroot

+ env['CGO_LDFLAGS'] += ' --sysroot %s' % sysroot

env['CC'] = '%s --sysroot %s' % (ndk_cc, sysroot)

call_result = subprocess.call([go_tool] + go_options, env=env)