From cf27229c88c4df2707372ae8c952177137086b44 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 24 Sep 2014 18:50:54 -0400 Subject: os: fix Args setup on Windows Should fix the Windows build. Untested. on Windows, args are made by src/os/exec_windows.go, not package runtime. runtime?goargs has if(Windows) return; The two init funcs in pkg os were conflicting, with the second overwriting Args back to an empty slice. LGTM=rsc R=rsc CC=golang-codereviews https://codereview.appspot.com/143540044 Committer: Russ Cox --- src/os/proc.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/os') diff --git a/src/os/proc.go b/src/os/proc.go index b63c85ad9..774f09900 100644 --- a/src/os/proc.go +++ b/src/os/proc.go @@ -6,12 +6,19 @@ package os -import "syscall" +import ( + "runtime" + "syscall" +) // Args hold the command-line arguments, starting with the program name. var Args []string func init() { + if runtime.GOOS == "windows" { + // Initialized in exec_windows.go. + return + } Args = runtime_args() } -- cgit v1.2.1