Commit 3e78cead authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e8fcdebb'

* commit 'e8fcdebb':
  build: Allow specifying extra object files when linking HOSTPROGS
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 86b3435f e8fcdebb
...@@ -116,7 +116,7 @@ $(HOSTOBJS): %.o: %.c ...@@ -116,7 +116,7 @@ $(HOSTOBJS): %.o: %.c
$(call COMPILE,HOSTCC) $(call COMPILE,HOSTCC)
$(HOSTPROGS): %$(HOSTEXESUF): %.o $(HOSTPROGS): %$(HOSTEXESUF): %.o
$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $< $(HOSTLIBS) $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS)
$(OBJS): | $(sort $(dir $(OBJS))) $(OBJS): | $(sort $(dir $(OBJS)))
$(HOBJS): | $(sort $(dir $(HOBJS))) $(HOBJS): | $(sort $(dir $(HOBJS)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment