diff options
| author | Michael Meskes <meskes@debian.org> | 2009-06-02 15:31:14 +0200 |
|---|---|---|
| committer | Michael Meskes <meskes@debian.org> | 2009-06-02 15:31:14 +0200 |
| commit | ffd803c5f75d470a7bd301d9fc899703546bedfb (patch) | |
| tree | fb26b245ffdabdd258d0c22b77d678b7d0eaa6c2 /src/VBox/HostDrivers/Support | |
| parent | 2220b99e2bdc756de31bc9a247f026a5fcf63204 (diff) | |
| download | virtualbox-ffd803c5f75d470a7bd301d9fc899703546bedfb.tar.gz | |
Imported Upstream version 2.2.4-dfsgupstream/2.2.4-dfsg
Diffstat (limited to 'src/VBox/HostDrivers/Support')
| -rw-r--r-- | src/VBox/HostDrivers/Support/linux/Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/VBox/HostDrivers/Support/linux/Makefile b/src/VBox/HostDrivers/Support/linux/Makefile index 456f84918..b66e0c70b 100644 --- a/src/VBox/HostDrivers/Support/linux/Makefile +++ b/src/VBox/HostDrivers/Support/linux/Makefile @@ -34,6 +34,11 @@ # (We have to support basic cross building (ARCH=i386|x86_64).) # While at it, warn about BUILD_* vars found to help with user problems. # +ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),) + BUILD_TARGET_ARCH_DEF := amd64 +else + BUILD_TARGET_ARCH_DEF := x86 +endif ifneq ($(filter-out amd64 x86,$(BUILD_TARGET_ARCH)),) $(warning Ignoring unknown BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)'.) BUILD_TARGET_ARCH := @@ -45,15 +50,13 @@ ifeq ($(BUILD_TARGET_ARCH),) ifeq ($(ARCH),i386) BUILD_TARGET_ARCH := x86 else - ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),) - BUILD_TARGET_ARCH := amd64 - else - BUILD_TARGET_ARCH := x86 - endif + BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF) endif endif else - $(warning Using BUILD_TARGET_ARCH='$(BUILD_TARGET_ARCH)' from the $(origin BUILD_TARGET_ARCH).) + ifneq ($(BUILD_TARGET_ARCH),$(BUILD_TARGET_ARCH_DEF)) + $(warning Using BUILD_TARGET_ARCH='$(BUILD_TARGET_ARCH)' from the $(origin BUILD_TARGET_ARCH).) + endif endif ifneq ($(filter-out release profile debug strict,$(BUILD_TYPE)),) @@ -63,7 +66,9 @@ endif ifeq ($(BUILD_TYPE),) BUILD_TYPE := release else - $(warning Using BUILD_TYPE='$(BUILD_TYPE)' from the $(origin BUILD_TYPE).) + ifneq ($(BUILD_TYPE),release) + $(warning Using BUILD_TYPE='$(BUILD_TYPE)' from the $(origin BUILD_TYPE).) + endif endif # override is required by the Debian guys |