[llvm-commits] [llvm] r161114 - /llvm/trunk/test/Makefile

[Will Schmidt]

On Wed, 2012-08-01 at 15:50 +0000, Nuno Lopes wrote:
> Author: nlopes
> Date: Wed Aug  1 10:50:34 2012
> New Revision: 161114
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=161114&view=rev
> Log:
> fix 'make check' when ocamlopt returns the compiler path with CFLAGS (and there's a cflag with a = char)
> 
> Modified:
>     llvm/trunk/test/Makefile
> 
> Modified: llvm/trunk/test/Makefile
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=161114&r1=161113&r2=161114&view=diff
> ==============================================================================
> --- llvm/trunk/test/Makefile (original)
> +++ llvm/trunk/test/Makefile Wed Aug  1 10:50:34 2012
> @@ -122,7 +122,7 @@
>  	@$(ECHOPATH) s=@SHLIBDIR@=$(SharedLibDir)=g >> lit.tmp
>  	@$(ECHOPATH) s=@SHLIBEXT@=$(SHLIBEXT)=g >> lit.tmp
>  	@$(ECHOPATH) s=@PYTHON_EXECUTABLE@=python=g >> lit.tmp
> -	@$(ECHOPATH) s=@OCAMLOPT@=$(OCAMLOPT) -cc \"$(CXX_FOR_OCAMLOPT)\" -I $(LibDir)/ocaml=g >> lit.tmp
> +	@$(ECHOPATH) s, at OCAMLOPT@,$(OCAMLOPT) -cc \\\\\"$(CXX_FOR_OCAMLOPT)\\\\\" -I $(LibDir)/ocaml,g >> lit.tmp
>  	@$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp
>  	@$(ECHOPATH) s=@ENABLE_ASSERTIONS@=$(ENABLE_ASSERTIONS)=g >> lit.tmp
>  	@$(ECHOPATH) s=@TARGETS_TO_BUILD@=$(TARGETS_TO_BUILD)=g >> lit.tmp
> 

Hi Nuno, 

This works a bit better than before, but the sed replace operation is
still failing for me.  It's behaving like the comma is special, but I
don't obviously see why.  (This does work if I replace comma "," with a
"#".).  

(occurring on buildbot as well, see:
http://lab.llvm.org:8011/builders/llvm-ppc64-linux1/builds/105/steps/test-llvm/logs/stdio )


make[1]: Entering directory `/home/willschm/head/llvm/test'
Making LLVM 'lit.site.cfg' file...
sed: file lit.tmp line 1: unknown option to `s'
make[1]: *** [lit.site.cfg] Error 1
...

Relevant portion of my lit.tmp looks like so:
s, at OCAMLOPT@,/bin/ocamlopt -cc \\"g++ -Wall -D_FILE_OFFSET_BITS=64
-D_REENTRANT -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions
-fstack-protector --param=ssp-buffer-size=4 -m64\\"
-I /home/willschm/head/llvm/Release+Asserts/lib/ocaml,g

and the error can be produced by feeding that directly into sed:
~$ sed -f lit.tmp
sed: file lit.tmp line 1: unknown option to `s'

thanks, 
-Will