From 9796d7beb16f86a2e9482febfd76f3e10a191f90 Mon Sep 17 00:00:00 2001 From: Audrius Butkevicius Date: Fri, 11 Jan 2019 23:11:42 +0000 Subject: [PATCH] Fix builds with Go 1.10 onwards (#1265) --- syncthing/build-syncthing.py | 5 ++--- syncthing/src/github.com/syncthing/syncthing | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/syncthing/build-syncthing.py b/syncthing/build-syncthing.py index aecb8250..e63b2422 100644 --- a/syncthing/build-syncthing.py +++ b/syncthing/build-syncthing.py @@ -111,12 +111,11 @@ for target in BUILD_TARGETS: environ.update({ 'GOPATH': module_dir, 'CGO_ENABLED': '1', - 'CC': os.path.join(standalone_ndk_dir, 'bin', target['cc']) }) subprocess.check_call([ - 'go', 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'], - ] + pkg_argument + ['-no-upgrade', 'build'], env=environ, cwd=syncthing_dir) + 'go', 'run', 'build.go', '-goos', 'android', '-goarch', target['goarch'], '-cc', os.path.join(standalone_ndk_dir, 'bin', target['cc']) + ] + pkg_argument + ['-no-upgrade', 'build'], env=environ, cwd=syncthing_dir) # Copy compiled binary to jniLibs folder target_dir = os.path.join(project_dir, 'app', 'src', 'main', 'jniLibs', target['jni_dir']) diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing index 03821d8b..d4f0544d 160000 --- a/syncthing/src/github.com/syncthing/syncthing +++ b/syncthing/src/github.com/syncthing/syncthing @@ -1 +1 @@ -Subproject commit 03821d8bd3bcff790a4be3fda92c13c59c5dec80 +Subproject commit d4f0544d9e3e3ddd254c36c45c6ee0522a05a2fa