Make sure the path is properly set in the llvmgcc and llvmgxx variables.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19267 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index cd05c29b9bc1864fc1b4a02050558e283f9c7b64..36bdfc2b63211bc6f03967695a43669761fd0af4 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -44,8 +44,8 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
        @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 llvmgcc "$(LLVMGCCWITHPATH)"' >> site.tmp
-       @echo 'set llvmgxx "$(LLVMGXXWITHPATH)"' >> site.tmp
+       @echo 'set llvmgcc "PATH=$(LLVMToolDir):$(PATH) $(LLVMGCC)"' >> site.tmp
+       @echo 'set llvmgxx "PATH=$(LLVMToolDir):$(PATH) $(LLVMGCC)"' >> site.tmp
        @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
        @test ! -f site.exp || \
        sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp