mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-26 17:23:19 +00:00
Merge commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c'
* commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c': build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
0a0517bbf5
@ -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)))
|
||||
|
8
configure
vendored
8
configure
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user