diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 6 | ||||
| -rw-r--r-- | test/lib/llvm.exp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/test/Makefile b/test/Makefile index 3cd461d7..01def0f1 100644 --- a/test/Makefile +++ b/test/Makefile @@ -89,10 +89,8 @@ site.exp: Makefile $(LEVEL)/Makefile.config @echo 'set compile_c "$(CC) $(CPP.Flags) $(C.Flags) $(CompileCommonOpts) -c "' >>site.tmp @echo 'set compile_cxx "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) - c"' >> site.tmp @echo 'set link "$(CXX) $(CPP.Flags) $(CXX.Flags) $(CompileCommonOpts) $(LD.Flags)"' >>site.tmp - @echo 'set llvmgcc "$(LLVMGCC)"' >> site.tmp - @echo 'set llvmgxx "$(LLVMGCC)"' >> site.tmp - @echo 'set llvmgccmajvers "$(LLVMGCC_MAJVERS)"' >> site.tmp - @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp + @echo 'set llvmgcc "$(LLVMCC)"' >> site.tmp + @echo 'set llvmgxx "$(LLVMCXX)"' >> 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 diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp index 2857dd82..158cc54c 100644 --- a/test/lib/llvm.exp +++ b/test/lib/llvm.exp @@ -43,8 +43,8 @@ proc execOneLine { test PRS outcome lineno line } { # cases. proc substitute { line test tmpFile } { global srcroot objroot srcdir objdir subdir target_triplet prcontext - global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers - global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir + global llvmgcc llvmgxx llvmgcc_version + global gccpath gxxpath compile_c compile_cxx link llvmlibsdir global llvmtoolsdir set path [file join $srcdir $subdir] @@ -63,8 +63,6 @@ proc substitute { line test tmpFile } { regsub -all {%compile_cxx} $new_line "$compile_cxx" new_line #replace %link with C++ link command regsub -all {%link} $new_line "$link" new_line - #replace %shlibext with shared library extension - regsub -all {%shlibext} $new_line "$shlibext" new_line #replace %llvmlibsdir with configure library directory regsub -all {%llvmlibsdir} $new_line "$llvmlibsdir" new_line #replace %klee with klee binary |