From fabdf8087e0cf4f8717e829d66cba7aed005e9ae Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 13 Apr 2006 20:33:59 +0000 Subject: [PATCH] Use quotes properly so that the possibility of a null variable set is eliminated. This can happen, for example, if LLVM is configured without llvm-gcc in which case things like LLVMGCC_VERSION will be empty. In such cases, deja-gnu fails with: can't read "llvmgcc_version": no such variable because it sees: set llvmgcc_version instead of: set llvmgcc_version "" llvm-svn: 27676 --- llvm/test/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/test/Makefile b/llvm/test/Makefile index ab43cff5fce8..452961953663 100644 --- a/llvm/test/Makefile +++ b/llvm/test/Makefile @@ -40,11 +40,11 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config @echo '## these variables are automatically generated by make ##' >site.tmp @echo '# Do not edit here. If you wish to override these values' >>site.tmp @echo '# edit the last section' >>site.tmp - @echo "set target_triplet $(TARGET_TRIPLE)" >> site.tmp - @echo "set llvmgcc_version $(LLVMGCC_VERSION)" >> site.tmp + @echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp + @echo 'set llvmgcc_version "$(LLVMGCC_VERSION)"' >> site.tmp @echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp - @echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp - @echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp + @echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp + @echo 'set objdir "$(LLVM_OBJ_ROOT)/test"' >>site.tmp @echo 'set llvmgcc "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp @echo 'set llvmgxx "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp