From 8603b6370bb5f713f113110c0986c3fd339a3c38 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 10 Jun 2010 07:30:43 -0400
Subject: [PATCH] reorder executable-path initialization  fixes GRacket on Mac
 OS X and probably Win32;  further fixes still needed to avoid allocating
 tagged   objects before calling scheme_basic_env()

---
 src/racket/cmdline.inc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/racket/cmdline.inc b/src/racket/cmdline.inc
index f823161c84..24acdb9ea0 100644
--- a/src/racket/cmdline.inc
+++ b/src/racket/cmdline.inc
@@ -1156,6 +1156,15 @@ static int run_from_cmd_line(int argc, char *_argv[],
 
     sch_argv = create_cmdline_args_vector(argc, argv);
     
+    {
+      Scheme_Object *ps;
+      scheme_set_exec_cmd(prog);
+      if (!sprog)
+        sprog = prog;
+      
+      ps = scheme_set_run_cmd(sprog);
+    }
+
 #ifndef NO_FILE_SYSTEM_UTILS
     scheme_init_collection_paths_post(global_env, l, r);
 #endif
@@ -1164,15 +1173,6 @@ static int run_from_cmd_line(int argc, char *_argv[],
   if (no_compiled)
     scheme_set_param(scheme_current_config(), MZCONFIG_USE_COMPILED_KIND, scheme_make_null());
 
-  {
-    Scheme_Object *ps;
-    scheme_set_exec_cmd(prog);
-    if (!sprog)
-      sprog = prog;
-  
-    ps = scheme_set_run_cmd(sprog);
-  }
-
 #ifndef NO_FILE_SYSTEM_UTILS
   /* Setup path for "addon" directory: */
   {