[CRIU] [PATCH] build: Don't pass --wrap on every linking file only for CRIU target only

Dmitry Safonov dsafonov at virtuozzo.com
Thu May 5 05:16:23 PDT 2016


On 05/05/2016 02:44 PM, Cyrill Gorcunov wrote:
> https://github.com/xemul/criu/issues/155
>
> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
Reviewed-by: Dmitry Safonov <dsafonov at virtuozzo.com>
> ---
>  criu/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/criu/Makefile b/criu/Makefile
> index f2ccbe2365ce..9b6682d172e5 100644
> --- a/criu/Makefile
> +++ b/criu/Makefile
> @@ -1,6 +1,6 @@
>  # here is a workaround for a bug in libnl-3:
>  # 6a8d90f5fec4 "attr: Allow attribute type 0"
> -LDFLAGS			+= -Wl,--wrap=nla_parse,--wrap=nlmsg_parse
> +WRAPFLAGS		+= -Wl,--wrap=nla_parse,--wrap=nlmsg_parse
>
>  ARCH_DIR		:= arch/$(SRCARCH)
>  export ARCH_DIR
> @@ -125,7 +125,7 @@ built-in.o: pie
>
>  criu: $(PROGRAM-BUILTINS)
>  	$(call msg-link, $@)
> -	$(Q) $(CC) $(CFLAGS) $^ $(ARCH-LIB) $(LIBS) $(LDFLAGS) $(GMONLDOPT) -rdynamic -o $@
> +	$(Q) $(CC) $(CFLAGS) $^ $(ARCH-LIB) $(LIBS) $(WRAPFLAGS) $(LDFLAGS) $(GMONLDOPT) -rdynamic -o $@
>
>
>  subclean:
>


-- 
Regards,
Dmitry Safonov


More information about the CRIU mailing list