ffmpeg | branch: master | Clément Bœsch <[email protected]> | Mon Apr 17 09:39:31 2017 +0200| [0a0517bbf51117013400ed4520eba13aa94a77b8] | committer: Clément Bœsch
Merge commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c' * commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c': build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a0517bbf51117013400ed4520eba13aa94a77b8 --- common.mak | 2 +- configure | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common.mak b/common.mak index adaf398a57..909dfc1bb6 100644 --- a/common.mak +++ b/common.mak @@ -143,7 +143,7 @@ $(HOSTOBJS): %.o: %.c $(COMPILE_HOSTC) $(HOSTPROGS): %$(HOSTEXESUF): %.o - $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS) + $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS) $(OBJS): | $(sort $(dir $(OBJS))) $(HOBJS): | $(sort $(dir $(HOBJS))) diff --git a/configure b/configure index d3b733cf66..78e226398a 100755 --- a/configure +++ b/configure @@ -2218,9 +2218,9 @@ CMDLINE_SET=" gas host_cc host_cflags + host_extralibs host_ld host_ldflags - host_libs host_os install ld @@ -3335,7 +3335,7 @@ HOSTCC_E='-E -o $@' HOSTCC_O='-o $@' HOSTLD_O='-o $@' -host_libs='-lm' +host_extralibs='-lm' host_cflags_filter=echo host_ldflags_filter=echo @@ -4778,7 +4778,7 @@ case $target_os in haiku) prefix_default="/boot/common" network_extralibs="-lnetwork" - host_libs= + host_extralibs= ;; sunos) SHFLAGS='-shared -Wl,-h,$$(@F)' @@ -6722,7 +6722,7 @@ HOSTCFLAGS=$host_cflags HOSTCPPFLAGS=$host_cppflags HOSTEXESUF=$HOSTEXESUF HOSTLDFLAGS=$host_ldflags -HOSTLIBS=$host_libs +HOSTEXTRALIBS=$host_extralibs DEPHOSTCC=$host_cc DEPHOSTCCFLAGS=$DEPHOSTCCFLAGS \$(HOSTCCFLAGS) HOSTCCDEP=$HOSTCCDEP ====================================================================== diff --cc configure index d3b733cf66,dc540f6d9b..78e226398a --- a/configure +++ b/configure @@@ -2210,21 -1802,16 +2210,21 @@@ CMDLINE_SET= cpu cross_prefix custom_allocator + cxx dep_cc + doxygen env extra_version + gas host_cc host_cflags + host_extralibs host_ld host_ldflags - host_libs host_os + install ld + ln_s logfile malloc_prefix nm _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
