Date: Sun, 17 Sep 2017 19:09:45 +0200 From: Christoph Moench-Tegeder <cmt@burggraben.net> To: freebsd-ports@freebsd.org Subject: Re: lang/rust broken Makefile Message-ID: <20170917170944.GA65302@elch.exwg.net> In-Reply-To: <20170917141758.GB45923@v007.zyxst.net> References: <20170917141758.GB45923@v007.zyxst.net>
next in thread | previous in thread | raw e-mail | index | archive | help
## tech-lists (tech-lists@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?
You've an unresolved merge conflict there. I guess you edited the Makefile
at some point (the indentation looks funny - but that may have happened
during copy&paste), and ignored the conflict during svn update. Perhaps
you didn't even intend to edit the file but saved it after "viewing" (and
accidentially editing) it in some editor.
Quite surly that conflict hasn't been part of the official version of the
Makefile over the last few versions, see
https://svnweb.freebsd.org/ports/head/lang/rust/Makefile?annotate=449914
and related.
Regards,
Christoph
--
Spare Space
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170917170944.GA65302>