Index: tolbase/generic/tolbase.c
===================================================================
--- tolbase/generic/tolbase.c	(revision 6688079201a44f8e0b374ca070f49a948cc424be)
+++ tolbase/generic/tolbase.c	(revision c6181a1929fbae883d1cbdcaecb556b46cd9ef3c)
@@ -103,8 +103,10 @@
 #endif
 
+  g_argc = argc;
+  g_argv = argv;
 #ifndef WIN32
     const char * version = TOLVersion();
 #endif
-    Tk_Main(argc, argv, TK_LOCAL_APPINIT);
+    Tk_Main( 1, argv, TK_LOCAL_APPINIT);
     return 0;			/* Needed only to prevent compiler warning. */
 }
@@ -166,6 +168,6 @@
      */
 
+    SetupArgv( interp );
 #if defined(WIN32)
-    SetupArgv( interp );
     Tcl_VarEval( interp, "lappend", " auto_path", " [file join",
 		 " [file dir [file dir ", Tcl_GetNameOfExecutable(),