lang/rust broken Makefile

[tech-lists]

On 17/09/2017 18:09, Christoph Moench-Tegeder wrote:
> ## tech-lists (tech-lists at zyxst.net):
> 
>> my "fix" was to change this:
>>
>> # FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped,
>> # but they contain non-object files which make strip(1) unhappy.
>>         @${STRIP_CMD} \
>> <<<<<<< .mine
>> 	${STAGEDIR}${PREFIX}/bin/rustc \
> 
> Wait - that's verbatim in your version of the Makefile?

yep

> You've an unresolved merge conflict there. I guess you edited the Makefile
> at some point 

No. This is as I got it via svnupdate. Have a look at

https://svn.freebsd.org/ports/head/lang/rust/Makefile

thanks,

-- 
J.