diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-08-27 05:09:29 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-08-27 20:37:48 +0200 |
| commit | 8f7c26e39297c8ecc8670a04936e47fbfc33439b (patch) | |
| tree | 48c1be47416a9ec95a8b08e028f3fbd5c447f9d0 | |
| parent | d5683aba5a4ca142ce9d446b565f7310107872c3 (diff) | |
| download | ffmpeg-8f7c26e39297c8ecc8670a04936e47fbfc33439b.tar.gz | |
build: Use portable abstraction for linker/hostcc output file syntax
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | common.mak | 2 | ||||
| -rw-r--r-- | library.mak | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -91,7 +91,7 @@ FF_DEP_LIBS := $(DEP_LIBS) all: $(PROGS) $(TOOLS): %$(EXESUF): %.o - $(LD) $(LDFLAGS) -o $@ $< $(ELIBS) + $(LD) $(LDFLAGS) $(LD_O) $< $(ELIBS) tools/cws2fws$(EXESUF): ELIBS = -lz @@ -135,7 +135,7 @@ endef $(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P)))) $(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) - $(LD) $(LDFLAGS) -o $@ $(OBJS-$*) cmdutils.o $(FF_EXTRALIBS) + $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) cmdutils.o $(FF_EXTRALIBS) OBJDIRS += tools diff --git a/common.mak b/common.mak index f94a43d35a..ae87e76bbd 100644 --- a/common.mak +++ b/common.mak @@ -38,7 +38,7 @@ $(HOSTOBJS): %.o: %.c $(call COMPILE,HOSTCC) $(HOSTPROGS): %$(HOSTEXESUF): %.o - $(HOSTCC) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS) + $(HOSTCC) $(HOSTLDFLAGS) $(HOSTCC_O) $< $(HOSTLIBS) $(OBJS): | $(sort $(dir $(OBJS))) $(HOSTOBJS): | $(sort $(dir $(HOSTOBJS))) diff --git a/library.mak b/library.mak index 9742ac4b7b..165a78204f 100644 --- a/library.mak +++ b/library.mak @@ -35,14 +35,14 @@ install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared define RULES $(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o - $$(LD) $(LDFLAGS) -o $$@ $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) + $$(LD) $(LDFLAGS) $$(LD_O) $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS) $(SLIB_CREATE_DEF_CMD) - $$(LD) $(SHFLAGS) $(LDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS) + $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) clean:: |