diff options
| author | Torok Edwin <edwintorok@gmail.com> | 2008-10-21 17:21:32 +0000 |
|---|---|---|
| committer | Torok Edwin <edwintorok@gmail.com> | 2008-10-21 17:21:32 +0000 |
| commit | 016fa4cd0dfd2690a4f8ba419c87e4b036eafcb5 (patch) | |
| tree | dc28a4be5141fb1b8ca46e02824e144312fc7697 | |
| parent | cfebc18d7ca6f7e5b974fe2f2b8f8354a0ba8c63 (diff) | |
| download | bcm5719-llvm-016fa4cd0dfd2690a4f8ba419c87e4b036eafcb5.tar.gz bcm5719-llvm-016fa4cd0dfd2690a4f8ba419c87e4b036eafcb5.zip | |
Fix make check on Solaris 10/x86: the default grep is not GNU grep, same for as.
llvm-svn: 57912
| -rw-r--r-- | llvm/Makefile.config.in | 1 | ||||
| -rw-r--r-- | llvm/autoconf/configure.ac | 1 | ||||
| -rw-r--r-- | llvm/test/Makefile | 2 | ||||
| -rw-r--r-- | llvm/test/lib/llvm.exp | 7 |
4 files changed, 10 insertions, 1 deletions
diff --git a/llvm/Makefile.config.in b/llvm/Makefile.config.in index 7f2acf23970..f2239ef6a0e 100644 --- a/llvm/Makefile.config.in +++ b/llvm/Makefile.config.in @@ -160,6 +160,7 @@ OCAMLC := @OCAMLC@ OCAMLOPT := @OCAMLOPT@ OCAMLDEP := @OCAMLDEP@ OCAMLDOC := @OCAMLDOC@ +GAS := @GAS@ POD2HTML := @POD2HTML@ POD2MAN := @POD2MAN@ RUNTEST := @RUNTEST@ diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 3fd4c9b89c3..d013fed21fd 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -614,6 +614,7 @@ AC_PATH_PROGS(OCAMLC, [ocamlc.opt ocamlc]) AC_PATH_PROGS(OCAMLOPT, [ocamlopt.opt ocamlopt]) AC_PATH_PROGS(OCAMLDEP, [ocamldep.opt ocamldep]) AC_PATH_PROGS(OCAMLDOC, [ocamldoc.opt ocamldoc]) +AC_PATH_PROGS(GAS, [gas as]) dnl Determine if the linker supports the -R option. AC_LINK_USE_R diff --git a/llvm/test/Makefile b/llvm/test/Makefile index 391776bb4df..676114850a8 100644 --- a/llvm/test/Makefile +++ b/llvm/test/Makefile @@ -110,6 +110,8 @@ site.exp: FORCE @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp @echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp @echo 'set valgrind "$(VALGRIND)"' >> site.tmp + @echo 'set grep "$(GREP)"' >>site.tmp + @echo 'set gas "$(GAS)"' >>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/llvm/test/lib/llvm.exp b/llvm/test/lib/llvm.exp index a844152bf23..b5d5cffae1e 100644 --- a/llvm/test/lib/llvm.exp +++ b/llvm/test/lib/llvm.exp @@ -49,7 +49,7 @@ proc substitute { line test tmpFile } { global srcroot objroot srcdir objdir subdir target_triplet prcontext global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir - global valgrind + global valgrind grep gas set path [file join $srcdir $subdir] # Substitute all Tcl variables. @@ -84,6 +84,11 @@ proc substitute { line test tmpFile } { #replace _#MARKER#_ with % regsub -all {_#MARKER#_} $new_line % new_line + #replace grep with GNU grep + regsub -all { grep } $new_line " $grep " new_line + #replace as with GNU as + regsub -all {\| as } $new_line "| $gas " new_line + #valgind related stuff # regsub -all {bugpoint } $new_line "$valgrind bugpoint " new_line regsub -all {llc } $new_line "$valgrind llc " new_line |
