diff --git a/gcc/configure.frag b/gcc/configure.frag
index 2fda0333a30..f8c17dd1c3e 100644
--- a/gcc/configure.frag
+++ b/gcc/configure.frag
@@ -23,13 +23,9 @@
 rm -f Make-lang
 touch Make-lang
 
-# We can either be invoked with . from configure or from Makefile.
-# Some shells can't pass arguments to source'd scripts.
-# ??? This needs some rethinking.
-
-savesrcdir=$srcdir
-savesubdirs=$subdirs
-
+# First parameter is the source directory, second is list of subdirectories
+savesrcdir=$1
+savesubdirs=$2
 for subdir in . $savesubdirs
 do
 	oldsrcdir=$savesrcdir