make: finish correcting host/build semantics

4 files changed, 20 insertions, 20 deletions

diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index 062135f7b..bb7500492 100644
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -1,7 +1,7 @@
 CONTRIB.build/    = $(BUILD/)contrib/
 CONTRIB.download/ = $(SRC/)download/
-CONTRIB.host      = $(if $(filter 1,$(BUILD.cross)),$(BUILD.spec))
-CONTRIB.spec      = $(if $(filter 1,$(BUILD.cross)),$(HOST.spec))
+CONTRIB.host      = $(if $(filter 1,$(HOST.cross)),$(HOST.spec))
+CONTRIB.spec      = $(if $(filter 1,$(HOST.cross)),$(BUILD.spec))
 
 ###############################################################################
 
@@ -69,7 +69,7 @@ define import.CONTRIB.defs
     ##
     $(1).PATCH.srcs = $$(sort $$(wildcard \
         $$($(1).src/)A??-*.patch \
-        $$($(1).src/)P??-$$(BUILD.system)*.patch ))
+        $$($(1).src/)P??-$$(HOST.system)*.patch ))
 
     # extra line feed is required
     define $(1).PATCH.item
diff --git a/make/include/gcc.defs b/make/include/gcc.defs
index 83b26aafa..7a67f4b2f 100644
--- a/make/include/gcc.defs
+++ b/make/include/gcc.defs
@@ -47,7 +47,7 @@ GCC.args.dylib     = -dynamiclib
 GCC.args.ML        = -fmessage-length=0
 GCC.args.H         = -H
 GCC.args.W         = -W$(1)
-ifeq (darwin,$(BUILD.system))
+ifeq (darwin,$(HOST.system))
     GCC.args.archs = -arch $(1)
 endif
 GCC.args.sysroot   = --sysroot=$(1)
@@ -73,7 +73,7 @@ GCC.args.L         = -L$(1)
 GCC.args.l         = -l$(1)
 GCC.args.end       = -Wl,--end-group
 
-ifeq ($(BUILD.machine),$(filter $(BUILD.machine),i686 x86_64))
+ifeq ($(HOST.machine),$(filter $(HOST.machine),i686 x86_64))
     GCC.args.extra = $(CFLAGS) $(CPPFLAGS) -mfpmath=sse -msse2
 else
     GCC.args.extra = $(CFLAGS) $(CPPFLAGS)
diff --git a/make/include/main.defs b/make/include/main.defs
index 5a5118e60..dda33acdf 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -7,13 +7,13 @@ include $(SRC/)make/include/tool.defs
 
 ###############################################################################
 
-ifneq (,$(filter $(BUILD.system),cygwin mingw))
+ifneq (,$(filter $(HOST.system),cygwin mingw))
 ifneq ($(HAS.bz2),1)
     MODULES += contrib/bzip2
 endif
 endif
 
-ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
+ifneq (,$(filter $(HOST.system),darwin cygwin mingw))
     MODULES += contrib/freetype
     MODULES += contrib/fribidi
     MODULES += contrib/harfbuzz
@@ -64,11 +64,11 @@ ifeq (1,$(FEATURE.nvenc))
     MODULES += contrib/nvenc
 endif
 
-ifneq (,$(filter $(BUILD.system),darwin))
+ifneq (,$(filter $(HOST.system),darwin))
     MODULES += contrib/xz
 endif
 
-ifneq (,$(filter $(BUILD.system),cygwin mingw))
+ifneq (,$(filter $(HOST.system),cygwin mingw))
 ifneq ($(HAS.iconv),1)
     MODULES += contrib/libiconv
 endif
@@ -83,7 +83,7 @@ ifneq ($(HAS.regex),1)
 endif
 endif
 
-ifneq (,$(filter $(BUILD.system),solaris))
+ifneq (,$(filter $(HOST.system),solaris))
     MODULES += contrib/libiconv
 endif
 
@@ -93,7 +93,7 @@ MODULES += libhb
 
 ###############################################################################
 
-ifeq (1-darwin,$(FEATURE.xcode)-$(BUILD.system))
+ifeq (1-darwin,$(FEATURE.xcode)-$(HOST.system))
     ## use macosx module when xcode+darwin
     MODULES += macosx
 else
@@ -101,26 +101,26 @@ else
     MODULES += test
 endif
 
-ifeq (1-mingw,$(FEATURE.gtk.mingw)-$(BUILD.system))
+ifeq (1-mingw,$(FEATURE.gtk.mingw)-$(HOST.system))
     MODULES += gtk
 endif
 
-ifeq (1-linux,$(FEATURE.gtk)-$(BUILD.system))
+ifeq (1-linux,$(FEATURE.gtk)-$(HOST.system))
     ## build gtk when gtk+linux
     MODULES += gtk
 endif
 
-ifeq (1-freebsd,$(FEATURE.gtk)-$(BUILD.system))
+ifeq (1-freebsd,$(FEATURE.gtk)-$(HOST.system))
     ## build gtk when gtk+freebsd
     MODULES += gtk
 endif
 
-ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system))
+ifeq (1-kfreebsd,$(FEATURE.gtk)-$(HOST.system))
     ## build gtk when gtk+kfreebsd
     MODULES += gtk
 endif
 
-ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.system))
+ifeq (1-gnu,$(FEATURE.gtk)-$(HOST.system))
     ## build gtk when gtk+gnu
     MODULES += gtk
 endif
@@ -132,5 +132,5 @@ MODULES += pkg
 ###############################################################################
 
 include $(MODULES:%=$(SRC/)%/module.defs)
-include $(SRC/)make/variant/$(BUILD.system).defs
--include $(SRC/)make/variant/$(BUILD.system).$(BUILD.machine).defs
+include $(SRC/)make/variant/$(HOST.system).defs
+-include $(SRC/)make/variant/$(HOST.system).$(HOST.machine).defs
diff --git a/make/include/main.rules b/make/include/main.rules
index 6c3cbb05b..14df5b034 100644
--- a/make/include/main.rules
+++ b/make/include/main.rules
@@ -35,8 +35,8 @@ mrproper: xclean
 include $(SRC/)make/include/base.rules
 
 include $(MODULES:%=$(SRC/)%/module.rules)
--include $(SRC/)make/variant/$(BUILD.system).rules
--include $(SRC/)make/variant/$(BUILD.system).$(BUILD.machine).rules
+-include $(SRC/)make/variant/$(HOST.system).rules
+-include $(SRC/)make/variant/$(HOST.system).$(HOST.machine).rules
 
 ###############################################################################