diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-17 09:39:31 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-17 09:39:31 +0200 |
| commit | 0a0517bbf51117013400ed4520eba13aa94a77b8 (patch) | |
| tree | c364e7d7a88f12df6566cc68446b1a41ce1bc607 | |
| parent | 3675f545e720dc0ea5090e53b796e8bdfc03b57a (diff) | |
| parent | 0507cd5b9f3c3769645bc6e9177eaf760f490d1c (diff) | |
Merge commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c'
* commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c':
build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | common.mak | 2 | ||||
| -rwxr-xr-x | 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))) @@ -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 |