* gcc.exp (gcc_target_compile): Put braces around

additional_flags=$TOOL_OPTIONS; allows for whitespace in $TOOL_OPTIONS.
* objc.exp (objc_target_compile): Likewise.
* treelang.exp (treelang_target_compile): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95912 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bf945a0..e1c73df 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-04  Matthew Sachs  <msachs@apple.com>
+
+       * gcc.exp (gcc_target_compile): Put braces around
+       additional_flags=$TOOL_OPTIONS; allows for whitespace in $TOOL_OPTIONS.
+       * objc.exp (objc_target_compile): Likewise.
+       * treelang.exp (treelang_target_compile): Likewise.
+
 2005-03-04  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
 
        PR fortran/19673

diff --git a/gcc/testsuite/lib/gcc.exp b/gcc/testsuite/lib/gcc.exp
index 2f55338..f0dc240 100644 (file)
--- a/gcc/testsuite/lib/gcc.exp
+++ b/gcc/testsuite/lib/gcc.exp
@@ -139,7 +139,7 @@ proc gcc_target_compile { source dest type options } {
     # TOOL_OPTIONS must come first, so that it doesn't override testcase
     # specific options.
     if [info exists TOOL_OPTIONS] {
-       set options [concat "additional_flags=$TOOL_OPTIONS" $options];
+       set options [concat "{additional_flags=$TOOL_OPTIONS}" $options];
     }
     if [target_info exists gcc,timeout] {
        lappend options "timeout=[target_info gcc,timeout]"

diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
index c9e6161..5041b70 100644 (file)
--- a/gcc/testsuite/lib/objc.exp
+++ b/gcc/testsuite/lib/objc.exp
@@ -162,7 +162,7 @@ proc objc_target_compile { source dest type options } {
     # TOOL_OPTIONS must come first, so that it doesn't override testcase
     # specific options.
     if [info exists TOOL_OPTIONS] {
-       set options [concat "additional_flags=$TOOL_OPTIONS" $options];
+       set options [concat "{additional_flags=$TOOL_OPTIONS}" $options];
     }
 
     # If we have built libobjc along with the compiler (which usually

diff --git a/gcc/testsuite/lib/treelang.exp b/gcc/testsuite/lib/treelang.exp
index 9b22534..dfce3d8 100644 (file)
--- a/gcc/testsuite/lib/treelang.exp
+++ b/gcc/testsuite/lib/treelang.exp
@@ -153,7 +153,7 @@ proc treelang_target_compile { source dest type options } {
     # TOOL_OPTIONS must come first, so that it doesn't override testcase
     # specific options.
     if [info exists TOOL_OPTIONS] {
-       set options [concat "additional_flags=$TOOL_OPTIONS" $options];
+       set options [concat "{additional_flags=$TOOL_OPTIONS}" $options];
     }
 
     # If we have built libtreelang along with the compiler (which usually