"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
load_lib llvm-dg.exp
llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
load_lib llvm-dg.exp
llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
@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 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 tooldir "$(ToolDir)"' >>site.tmp
- @echo 'set libdir "$(LibDir)"' >>site.tmp
+ @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp
+ @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp
@echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp
@echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp
@echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp
@echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp
@echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp
@echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp
proc llvm2cpp-test { files } {
# if { $env(LLVM_RUNLLVM2CPP_TEST) == 1 } {
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 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] } {
#Make Output Directory if it does not exist already
if { [file exists path] } {
- 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
if { $retval != 0 } {
fail "$test: gcc returned $retval\n$msg"
continue