[llvm-commits] [llvm] r57912 - in /llvm/trunk: Makefile.config.in autoconf/configure.ac test/Makefile test/lib/llvm.exp

[Bill Wendling]

Török,

Please regenerate the configure file. I'm getting this error during
"make check":

FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/test/CodeGen/Generic/2008-07-29-EHLabel.ll
for PR2609
Failed with posix(ENOENT,no such file or directory) at line 1
while running:  llvm-as <
/Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/test/CodeGen/Generic/2008-07-29-EHLabel.ll
|  llc -o - | @GAS@ -o /dev/null
couldn't execute "@GAS@": no such file or directory

-bw

On Tue, Oct 21, 2008 at 10:21 AM, Torok Edwin <edwintorok at gmail.com> wrote:
> Author: edwin
> Date: Tue Oct 21 12:21:32 2008
> New Revision: 57912
>
> URL: http://llvm.org/viewvc/llvm-project?rev=57912&view=rev
> Log:
> Fix make check on Solaris 10/x86: the default grep is not GNU grep, same for as.
>
> Modified:
>    llvm/trunk/Makefile.config.in
>    llvm/trunk/autoconf/configure.ac
>    llvm/trunk/test/Makefile
>    llvm/trunk/test/lib/llvm.exp
>
> Modified: llvm/trunk/Makefile.config.in
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.config.in?rev=57912&r1=57911&r2=57912&view=diff
>
> ==============================================================================
> --- llvm/trunk/Makefile.config.in (original)
> +++ llvm/trunk/Makefile.config.in Tue Oct 21 12:21:32 2008
> @@ -160,6 +160,7 @@
>  OCAMLOPT   := @OCAMLOPT@
>  OCAMLDEP   := @OCAMLDEP@
>  OCAMLDOC   := @OCAMLDOC@
> +GAS       := @GAS@
>  POD2HTML   := @POD2HTML@
>  POD2MAN    := @POD2MAN@
>  RUNTEST    := @RUNTEST@
>
> Modified: llvm/trunk/autoconf/configure.ac
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=57912&r1=57911&r2=57912&view=diff
>
> ==============================================================================
> --- llvm/trunk/autoconf/configure.ac (original)
> +++ llvm/trunk/autoconf/configure.ac Tue Oct 21 12:21:32 2008
> @@ -614,6 +614,7 @@
>  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
>
> Modified: llvm/trunk/test/Makefile
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=57912&r1=57911&r2=57912&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/Makefile (original)
> +++ llvm/trunk/test/Makefile Tue Oct 21 12:21:32 2008
> @@ -110,6 +110,8 @@
>        @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
>
> Modified: llvm/trunk/test/lib/llvm.exp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lib/llvm.exp?rev=57912&r1=57911&r2=57912&view=diff
>
> ==============================================================================
> --- llvm/trunk/test/lib/llvm.exp (original)
> +++ llvm/trunk/test/lib/llvm.exp Tue Oct 21 12:21:32 2008
> @@ -49,7 +49,7 @@
>   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 @@
>   #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
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>