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 b63c85ad9071490f06f819c3bbd649fbd46fe60e..774f09900ec58aac3c3897012bd545aa5247d81e 100644 (file)
--- 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()
 }