Merge commit 'upstream/2.20'

[msp430-binutils.git] / binutils / testsuite / config / default.exp

diff --git a/binutils/testsuite/config/default.exp b/binutils/testsuite/config/default.exp
index 3c849b8d6586c54e194073ccd79410116e285647..f3fd6244e9138e10cbb59c2a2c32fd5c2cf2cee1 100644 (file)
--- a/binutils/testsuite/config/default.exp
+++ b/binutils/testsuite/config/default.exp
@@ -1,4 +1,4 @@
-#   Copyright 1993, 1994, 1995, 1997, 1999, 2001, 2002, 2004, 2005, 2007
+#   Copyright 1993, 1994, 1995, 1997, 1999, 2001, 2002, 2004, 2005, 2007, 2009
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -94,8 +94,14 @@ if {[file isfile ld/ld-new[exe_ext]]} then {
 } else {
     link_or_copy ld/ld-new ld[exe_ext]
 }
-set gcc_gas_flag "-B[pwd]/tmpdir/gas/"
-set dlltool_gas_flag "-S [pwd]/tmpdir/gas/as[exe_ext]"
+if {[file isfile tmpdir/gas/as[exe_ext]]} then {
+    set gcc_gas_flag "-B[pwd]/tmpdir/gas/"
+    set dlltool_gas_flag "-S [pwd]/tmpdir/gas/as[exe_ext]"
+} else {
+    # Testing an installed toolchain.
+    set gcc_gas_flag ""
+    set dlltool_gas_flag ""
+}
 
 #
 # binutils_run