diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2006-05-28 07:22:42 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2006-05-28 07:22:42 +0000 |
| commit | 492196c89f922cf3a4cc6b426cd1a34414dfb447 (patch) | |
| tree | 181710a315debebf5f86d867db3700049f57f4bf /test/lib | |
| parent | 15d40594303072ed426116cfb9465a05313545e9 (diff) | |
| download | external_llvm-492196c89f922cf3a4cc6b426cd1a34414dfb447.zip external_llvm-492196c89f922cf3a4cc6b426cd1a34414dfb447.tar.gz external_llvm-492196c89f922cf3a4cc6b426cd1a34414dfb447.tar.bz2 | |
Fix a problem where dejagnu won't accept the value of global tcl variable
"libdir" for some reason. Changing to llvmlibsdir instead fixes it.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28526 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lib')
| -rw-r--r-- | test/lib/llvm2cpp.exp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/lib/llvm2cpp.exp b/test/lib/llvm2cpp.exp index 9066f77..8bd1044 100644 --- a/test/lib/llvm2cpp.exp +++ b/test/lib/llvm2cpp.exp @@ -7,12 +7,12 @@ proc llvm2cpp-test { files } { # if { $env(LLVM_RUNLLVM2CPP_TEST) == 1 } { - global subdir tooldir libdir objdir srcdir objroot srcroot + global subdir llvmtoolsdir llvmlibsdir objdir srcdir objroot srcroot set timeout 30 set path [file join $objdir $subdir] - set llvm2cpp [file join $tooldir llvm2cpp ] - set llvmas [file join $tooldir llvm-as ] - set llvmdis [file join $tooldir llvm-dis ] + set llvm2cpp [file join $llvmtoolsdir llvm2cpp ] + set llvmas [file join $llvmtoolsdir llvm-as ] + set llvmdis [file join $llvmtoolsdir llvm-dis ] #Make Output Directory if it does not exist already if { [file exists path] } { @@ -49,8 +49,7 @@ proc llvm2cpp-test { files } { } set retval [ catch { - exec -keepnewline gcc -g -D__STDC_LIMIT_MACROS -o $executable $generated -I$srcroot/include -I$objroot/include -L$libdir $libdir/LLVMCore.o -lLLVMSupport $libdir/LLVMbzip2.o -lLLVMSystem -lstdc++ } msg ] - + exec -keepnewline gcc -g -D__STDC_LIMIT_MACROS -o $executable $generated -I$srcroot/include -I$objroot/include -L$llvmlibsdir $llvmlibsdir/LLVMCore.o -lLLVMSupport $llvmlibsdir/LLVMbzip2.o -lLLVMSystem -lstdc++ } msg ] if { $retval != 0 } { fail "$test: gcc returned $retval\n$msg" continue |