maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make the shlibext and llvmlibsdir variables accessible. 

llvm-svn: 35939
This commit is contained in:
Reid Spencer 2007-04-12 02:49:30 +00:00
parent c6251a7dfd
commit 09f5000873
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/test/Makefile
View File

@ -67,6 +67,7 @@ site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
@echo 'set llvmgcc "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp @echo 'set llvmgcc "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
@echo 'set llvmgxx "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp @echo 'set llvmgxx "PATH=\"$(LLVMToolDir):$(PATH)\" \"$(LLVMGCC)\""' >> site.tmp
@echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp
@echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp
@echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
@test ! -f site.exp || \ @test ! -f site.exp || \
sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp

6
llvm/test/lib/llvm-dg.exp
View File

@ -1,7 +1,7 @@
proc llvm-runtest { programs } { proc llvm-runtest { programs } {
global srcroot objroot srcdir objdir subdir target_triplet prcontext global srcroot objroot srcdir objdir subdir target_triplet prcontext
global llvmgcc llvmgxx global llvmgcc_version llvmgccmajvers global llvmgcc llvmgxx global llvmgcc_version llvmgccmajvers
global gccpath gxxpath compile_c compile_cxx link global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
set timeout 60 set timeout 60
@ -60,6 +60,10 @@ proc llvm-runtest { programs } {
regsub -all {%compile_cxx} $new_runline "$compile_cxx" new_runline regsub -all {%compile_cxx} $new_runline "$compile_cxx" new_runline
#replace %link with C++ link command #replace %link with C++ link command
regsub -all {%link} $new_runline "$link" new_runline regsub -all {%link} $new_runline "$link" new_runline
#replace %shlibext with shared library extension
regsub -all {%shlibext} $new_runline "$shlibext" new_runline
#replace %llvmlibsdir with configure library directory
regsub -all {%llvmlibsdir} $new_runline "$llvmlibsdir" new_runline
#replace %p with path to source, #replace %p with path to source,
regsub -all {%p} $new_runline [file join $srcdir $subdir] new_runline regsub -all {%p} $new_runline [file join $srcdir $subdir] new_runline
#replace %s with filename #replace %s with filename