6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-23 17:24:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix make check on Solaris 10/x86: the default grep is not GNU grep, same for as.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57912 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Torok Edwin
2008-10-21 17:21:32 +00:00
parent a9ab95b38b
commit 237033e6ac
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.config.in
View File

@ -160,6 +160,7 @@ OCAMLC := @OCAMLC@
OCAMLOPT := @OCAMLOPT@ OCAMLOPT := @OCAMLOPT@
OCAMLDEP := @OCAMLDEP@ OCAMLDEP := @OCAMLDEP@
OCAMLDOC := @OCAMLDOC@ OCAMLDOC := @OCAMLDOC@
GAS := @GAS@
POD2HTML := @POD2HTML@ POD2HTML := @POD2HTML@
POD2MAN := @POD2MAN@ POD2MAN := @POD2MAN@
RUNTEST := @RUNTEST@ RUNTEST := @RUNTEST@

1
autoconf/configure.ac
View File

@ -614,6 +614,7 @@ AC_PATH_PROGS(OCAMLC, [ocamlc.opt ocamlc])
AC_PATH_PROGS(OCAMLOPT, [ocamlopt.opt ocamlopt]) AC_PATH_PROGS(OCAMLOPT, [ocamlopt.opt ocamlopt])
AC_PATH_PROGS(OCAMLDEP, [ocamldep.opt ocamldep]) AC_PATH_PROGS(OCAMLDEP, [ocamldep.opt ocamldep])
AC_PATH_PROGS(OCAMLDOC, [ocamldoc.opt ocamldoc]) AC_PATH_PROGS(OCAMLDOC, [ocamldoc.opt ocamldoc])
AC_PATH_PROGS(GAS, [gas as])
dnl Determine if the linker supports the -R option. dnl Determine if the linker supports the -R option.
AC_LINK_USE_R AC_LINK_USE_R

2
test/Makefile
View File

@ -110,6 +110,8 @@ site.exp: FORCE
@echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp
@echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp @echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp
@echo 'set valgrind "$(VALGRIND)"' >> 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 @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

7
test/lib/llvm.exp
View File

@ -49,7 +49,7 @@ proc substitute { line test tmpFile } {
global srcroot objroot srcdir objdir subdir target_triplet prcontext global srcroot objroot srcdir objdir subdir target_triplet prcontext
global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc
global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
global valgrind global valgrind grep gas
set path [file join $srcdir $subdir] set path [file join $srcdir $subdir]
# Substitute all Tcl variables. # Substitute all Tcl variables.
@ -84,6 +84,11 @@ proc substitute { line test tmpFile } {
#replace _#MARKER#_ with % #replace _#MARKER#_ with %
regsub -all {_#MARKER#_} $new_line % new_line 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 #valgind related stuff
# regsub -all {bugpoint } $new_line "$valgrind bugpoint " new_line # regsub -all {bugpoint } $new_line "$valgrind bugpoint " new_line
regsub -all {llc } $new_line "$valgrind llc " new_line regsub -all {llc } $new_line "$valgrind llc " new_line