Root/
| 1 | --- a/scripts/get_arch.mk |
| 2 | +++ b/scripts/get_arch.mk |
| 3 | @@ -36,11 +36,14 @@ ifeq (,$(ARCH-y)) |
| 4 | $(Cannot determine ARCH) |
| 5 | endif |
| 6 | |
| 7 | +# Allow ARCH to be x86 |
| 8 | +ifneq (,$(CONFIG_X86)) |
| 9 | +ifeq (x86,$(ARCH)) |
| 10 | +ARCH-y = $(ARCH) |
| 11 | +endif |
| 12 | +endif |
| 13 | + |
| 14 | # Don't allow ARCH to be overridden by a different value. |
| 15 | ifeq (,$(ARCH)) |
| 16 | ARCH = $(ARCH-y) |
| 17 | -else |
| 18 | -ifneq ($(ARCH),$(ARCH-y)) |
| 19 | -$(error ARCH mismatch: supplied "$(ARCH)", determined "$(ARCH-y)") |
| 20 | -endif |
| 21 | endif |
| 22 |
