diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-15 12:19:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-15 12:19:45 +0100 |
| commit | 3e78ceadf913a7a9d027e21f67c6f9767f83996b (patch) | |
| tree | 6ce202970e672a78109b8daaef9eaa07551eda67 | |
| parent | 86b3435fc01049cfa9dc0257ddbf1f531f7cb67a (diff) | |
| parent | e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23 (diff) | |
| download | ffmpeg-3e78ceadf913a7a9d027e21f67c6f9767f83996b.tar.gz | |
Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23'
* commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23':
build: Allow specifying extra object files when linking HOSTPROGS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | common.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common.mak b/common.mak index 6479b08e3c..b22badda9d 100644 --- a/common.mak +++ b/common.mak @@ -116,7 +116,7 @@ $(HOSTOBJS): %.o: %.c $(call COMPILE,HOSTCC) $(HOSTPROGS): %$(HOSTEXESUF): %.o - $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $< $(HOSTLIBS) + $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS) $(OBJS): | $(sort $(dir $(OBJS))) $(HOBJS): | $(sort $(dir $(HOBJS))) |