From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Wed, 24 Sep 2014 22:50:54 +0000 (-0400)
Subject: os: fix Args setup on Windows
X-Git-Tag: go1.4beta1~304
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=665a4166650d088c067130eb41f8f95efb9c12ed;p=gostls13.git

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://golang.org/cl/143540044
---

diff --git a/src/os/proc.go b/src/os/proc.go
index b63c85ad90..774f09900e 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()
 }