[CRIU] [PATCH 3/6] make: drop SRCARCH redefinition
Dmitry Safonov
dsafonov at virtuozzo.com
Mon Apr 24 11:37:16 PDT 2017
It's defined in NMK - don't redefine it.
Remove BTW twice exports and twice definition of $(LDARCH).
Call 64-bit ARM as aarch64.
Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
---
Makefile | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index 996f06400331..f55f5941aa76 100644
--- a/Makefile
+++ b/Makefile
@@ -21,40 +21,27 @@ export HOSTCFLAGS
#
# Architecture specific options.
-ifneq ($(filter-out x86 arm arm64 aarch64 ppc64,$(ARCH)),)
+ifneq ($(filter-out x86 arm aarch64 ppc64,$(ARCH)),)
$(error "The architecture $(ARCH) isn't supported")
endif
ifeq ($(ARCH),x86)
- SRCARCH := x86
LDARCH := i386:x86-64
VDSO := y
endif
-ifeq ($(ARCH),arm)
- SRCARCH := arm
-endif
-
-ifneq ($(filter arm64 aarch64,$(ARCH)),)
- ARCH := aarch64
- SRCARCH := aarch64
+ifeq ($(ARCH),aarch64)
VDSO := y
endif
ifeq ($(ARCH),ppc64)
- SRCARCH := ppc64
LDARCH := powerpc:common64
VDSO := y
endif
LDARCH ?= $(SRCARCH)
-export SRCARCH LDARCH VDSO
-
-SRCARCH ?= $(ARCH)
-LDARCH ?= $(SRCARCH)
-
-export SRCARCH LDARCH VDSO
+export LDARCH VDSO
UNAME-M := $(shell uname -m)
export UNAME-M
--
2.12.2
More information about the CRIU
mailing list