Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -612,10 +612,11 @@
 (define (launch:setup #!key (force #f))
   (let* ((toppath  (or *toppath* (getenv "MT_RUN_AREA_HOME"))) ;; preserve toppath
 	 (runname  (common:args-get-runname))
 	 (target   (common:args-get-target))
 	 (linktree (common:get-linktree))
+	 (sections (if target (list "default" target) #f)) ;; for runconfigs
 	 (mtconfig (or (args:get-arg "-config") "megatest.config")) ;; allow overriding megatest.config 
 	 (rundir   (if (and runname target linktree)(conc linktree "/" target "/" runname) #f))
 	 (mtcachef (and rundir (conc rundir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
 	 (rccachef (and rundir (conc rundir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
 	 (cancreate (and rundir (file-exists? rundir)(file-write-access? rundir))))
@@ -633,12 +634,11 @@
       (set! *configstatus* 'fulldata)
       (set! *toppath*      (get-environment-variable "MT_RUN_AREA_HOME"))
       *toppath*)
      ;; we have all the info needed to fully process runconfigs and megatest.config
      (mtcachef              
-      (let* ((sections   (list "default" target)) ;; for runconfigs
-	     (first-pass (find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
+      (let* ((first-pass (find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
 				  mtconfig
 				  environ-patt: "env-override"
 				  given-toppath: toppath
 				  pathenvvar: "MT_RUN_AREA_HOME"))
 	     (first-rundat  (read-config (conc toppath "/runconfigs.config") *runconfigdat* #t 
@@ -680,12 +680,11 @@
 			(or (args:get-arg "-config") "megatest.config")
 			environ-patt: "env-override"
 			given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
 			pathenvvar: "MT_RUN_AREA_HOME")))
 	(if cfgdat
-	    (let* ((sections (if target (list "default" target) #f))
-		   (toppath  (or (get-environment-variable "MT_RUN_AREA_HOME")(cadr cfgdat)))
+	    (let* ((toppath  (or (get-environment-variable "MT_RUN_AREA_HOME")(cadr cfgdat)))
 		   (rdat     (read-config (conc toppath
 						"/runconfigs.config") *runconfigdat* #t sections: sections)))
 	      (set! *configinfo*   cfgdat)
 	      (set! *configdat*    (car cfgdat))
 	      (set! *runconfigdat* rdat)