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 | 237033e6ac7e872f60dfc6724fcb938f2c263af3 (patch) | |
| tree | 469cedc9a430f7371cf284841dde7808deff0aed | |
| parent | a9ab95b38b0aec44e26a3b36a6b37498dc2acdde (diff) | |
| download | llvm-237033e6ac7e872f60dfc6724fcb938f2c263af3.tar.gz llvm-237033e6ac7e872f60dfc6724fcb938f2c263af3.tar.bz2 llvm-237033e6ac7e872f60dfc6724fcb938f2c263af3.tar.xz | |
Fix make check on Solaris 10/x86: the default grep is not GNU grep, same for as.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57912 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.config.in | 1 | ||||
| -rw-r--r-- | autoconf/configure.ac | 1 | ||||
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | test/lib/llvm.exp | 7 |
4 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index 7f2acf2397..f2239ef6a0 100644 --- a/Makefile.config.in +++ b/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/autoconf/configure.ac b/autoconf/configure.ac index 3fd4c9b89c..d013fed21f 100644 --- a/autoconf/configure.ac +++ b/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/test/Makefile b/test/Makefile index 391776bb4d..676114850a 100644 --- a/test/Makefile +++ b/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/test/lib/llvm.exp b/test/lib/llvm.exp index a844152bf2..b5d5cffae1 100644 --- a/test/lib/llvm.exp +++ b/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 |