diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-12-19 13:26:08 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-12-19 13:26:08 +0000 |
| commit | 59f9a1b614f0bdfca35857ce88e3ec0e351a0f00 (patch) | |
| tree | ffc304f18a0a40f6f43d3d20ac7b48a0ba64a020 /makefiles/Makefile.top | |
| parent | 5091cbad4a2cd9761a0ce20790e3386467a10c80 (diff) | |
| download | buildsystem-59f9a1b614f0bdfca35857ce88e3ec0e351a0f00.tar.gz buildsystem-59f9a1b614f0bdfca35857ce88e3ec0e351a0f00.tar.bz2 | |
Fix BUILD/HOST confusion
The recent buildsystem improvements now use BUILD and HOST to set the
ABI of the system doing the building and the ABI being
targeted. Unfortunately we got these the wrong way round, this fixes
that confusion.
Diffstat (limited to 'makefiles/Makefile.top')
| -rw-r--r-- | makefiles/Makefile.top | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top index 2d09276..38922d1 100644 --- a/makefiles/Makefile.top +++ b/makefiles/Makefile.top @@ -15,14 +15,15 @@ # # Optional inputs: # -# BUILDDIR Directory to build into (defaults to -# build-$(HOST)-$(BUILD)-$(VARIANT)-$(COMPONENT_TYPE)) +# BUILD Build platform identifier +# HOST Target host platform identifier, defaults to BUILD +# BUILDDIR Directory to place built output into (defaults to +# build-$(BUILD)-$(HOST)-$(VARIANT)-$(COMPONENT_TYPE)) +# This is not related to the BUILD platform identifier # CC_CAN_BUILD_AND_DEP Flag whether $(CC) is capable of calculating dependency # information at the same time as compiling sources. # Set to "yes" if it can. # DESTDIR Sandboxed FS root (e.g. for packaging) -# BUILD Target platform identifier, defaults to HOST -# HOST Host platform identifier # REQUIRED_PKGS List of required pkg-config packages # REQUIRED_LIBS List of required libraries to add to pkg-config # @@ -81,8 +82,8 @@ ifeq ($(COMPONENT_TYPE),) endif # Target platform must be defined by the client -ifeq ($(BUILD),) - $(error BUILD not defined) +ifeq ($(HOST),) + $(error HOST not defined) endif # Build variant, too @@ -110,7 +111,7 @@ patch-version := $(word 3,$(subst ., ,$(COMPONENT_VERSION))) ############################################################################## # Build directory -BUILDDIR ?= build-$(HOST)-$(BUILD)-$(VARIANT)-$(COMPONENT_TYPE) +BUILDDIR ?= build-$(BUILD)-$(HOST)-$(VARIANT)-$(COMPONENT_TYPE) # Build tree subdirs COVERAGEDIR := $(BUILDDIR)/coverage |