Merge commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c'

* commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c':
  build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS

Merged-by: Clément Bœsch <u@pkh.me>
pull/254/merge
Clément Bœsch 8 years ago
commit 0a0517bbf5
  1. 2
      common.mak
  2. 8
      configure

@ -143,7 +143,7 @@ $(HOSTOBJS): %.o: %.c
$(COMPILE_HOSTC) $(COMPILE_HOSTC)
$(HOSTPROGS): %$(HOSTEXESUF): %.o $(HOSTPROGS): %$(HOSTEXESUF): %.o
$(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTLIBS) $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS)
$(OBJS): | $(sort $(dir $(OBJS))) $(OBJS): | $(sort $(dir $(OBJS)))
$(HOBJS): | $(sort $(dir $(HOBJS))) $(HOBJS): | $(sort $(dir $(HOBJS)))

8
configure vendored

@ -2218,9 +2218,9 @@ CMDLINE_SET="
gas gas
host_cc host_cc
host_cflags host_cflags
host_extralibs
host_ld host_ld
host_ldflags host_ldflags
host_libs
host_os host_os
install install
ld ld
@ -3335,7 +3335,7 @@ HOSTCC_E='-E -o $@'
HOSTCC_O='-o $@' HOSTCC_O='-o $@'
HOSTLD_O='-o $@' HOSTLD_O='-o $@'
host_libs='-lm' host_extralibs='-lm'
host_cflags_filter=echo host_cflags_filter=echo
host_ldflags_filter=echo host_ldflags_filter=echo
@ -4778,7 +4778,7 @@ case $target_os in
haiku) haiku)
prefix_default="/boot/common" prefix_default="/boot/common"
network_extralibs="-lnetwork" network_extralibs="-lnetwork"
host_libs= host_extralibs=
;; ;;
sunos) sunos)
SHFLAGS='-shared -Wl,-h,$$(@F)' SHFLAGS='-shared -Wl,-h,$$(@F)'
@ -6722,7 +6722,7 @@ HOSTCFLAGS=$host_cflags
HOSTCPPFLAGS=$host_cppflags HOSTCPPFLAGS=$host_cppflags
HOSTEXESUF=$HOSTEXESUF HOSTEXESUF=$HOSTEXESUF
HOSTLDFLAGS=$host_ldflags HOSTLDFLAGS=$host_ldflags
HOSTLIBS=$host_libs HOSTEXTRALIBS=$host_extralibs
DEPHOSTCC=$host_cc DEPHOSTCC=$host_cc
DEPHOSTCCFLAGS=$DEPHOSTCCFLAGS \$(HOSTCCFLAGS) DEPHOSTCCFLAGS=$DEPHOSTCCFLAGS \$(HOSTCCFLAGS)
HOSTCCDEP=$HOSTCCDEP HOSTCCDEP=$HOSTCCDEP

Loading…
Cancel
Save