Diego Biurrun <[email protected]> writes:

> ---
>  Makefile   |    6 +++---
>  common.mak |    4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 52b6647..35324eb 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -45,7 +45,7 @@ COMPILE_S = $(call COMPILE,AS)
>       $(COMPILE_S)
>
>  %.ho: %.h
> -     $(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
> +     $(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c $(CC_O) -x c $<

And what about the -x c?  That's pretty much guaranteed to fail with
anything not gcc.

>  %.ver: %.v
>       $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
> @@ -89,7 +89,7 @@ FF_DEP_LIBS  := $(DEP_LIBS)
>  all: $(PROGS)
>
>  $(TOOLS): %$(EXESUF): %.o
> -     $(LD) $(LDFLAGS) -o $@ $< $(ELIBS)
> +     $(LD) $(LDFLAGS) $(CC_O) $< $(ELIBS)
>
>  tools/cws2fws$(EXESUF): ELIBS = -lz
>
> @@ -125,7 +125,7 @@ avplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
>  avserver$(EXESUF): LDFLAGS += $(AVSERVERLDFLAGS)
>
>  $(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
> -     $(LD) $(LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
> +     $(LD) $(LDFLAGS) $(CC_O) $< cmdutils.o $(FF_EXTRALIBS)

LD != CC.  The syntax is sometimes different, and this change will break
things that currently work.

>  OBJDIRS += tools
>
> diff --git a/common.mak b/common.mak
> index 98c274e..7932db9 100644
> --- a/common.mak
> +++ b/common.mak
> @@ -33,10 +33,10 @@ checkheaders: $(filter-out 
> $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho))
>  alltools: $(TOOLS)
>
>  $(HOSTOBJS): %.o: %.c
> -     $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
> +     $(HOSTCC) $(HOSTCFLAGS) -c $(CC_O) $<
>
>  $(HOSTPROGS): %$(HOSTEXESUF): %.o
> -     $(HOSTCC) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS)
> +     $(HOSTCC) $(HOSTLDFLAGS) $(CC_O) $< $(HOSTLIBS)
>
>  $(OBJS):     | $(sort $(dir $(OBJS)))
>  $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS)))
> -- 

Nothing says the host compiler has the same syntax as the target
compiler.  Until we do proper detection of the host compiler, this
should stay as is, or it _will_ break things.

-- 
Måns Rullgård
[email protected]
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to