Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-27 12:04:24 +00:00
Code Issues Projects Releases Wiki Activity

make: drop SRCARCH redefinition

Browse source 
It's defined in NMK - don't redefine it.
Remove BTW twice exports and twice definition of $(LDARCH).
Call 64-bit ARM as aarch64.

Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Dmitry Safonov 2017-04-24 21:37:16 +03:00 • committed by Andrei Vagin
parent a42ad2f033
commit 52188d31be
1 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Makefile
View file

@ -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