Add ARCH variable to Makefiles
In some Makefiles the ARCH variable was not set, although it was used. In executer/user/Makefile.in it was used before it was set.
This commit is contained in:
@ -10,6 +10,7 @@ MANDIR=@MANDIR@
|
||||
MCKERNEL_INCDIR=@MCKERNEL_INCDIR@
|
||||
MCKERNEL_LIBDIR=@MCKERNEL_LIBDIR@
|
||||
KDIR ?= @KDIR@
|
||||
ARCH=@ARCH@
|
||||
CFLAGS=-Wall -O -I. -I$(VPATH)/arch/${ARCH}
|
||||
LDFLAGS=@LDFLAGS@
|
||||
RPATH=$(shell echo $(LDFLAGS)|awk '{for(i=1;i<=NF;i++){if($$i~/^-L/){w=$$i;sub(/^-L/,"-Wl,-rpath,",w);print w}}}')
|
||||
@ -17,7 +18,6 @@ VPATH=@abs_srcdir@
|
||||
TARGET=mcexec libsched_yield ldump2mcdump.so
|
||||
@uncomment_if_ENABLE_MEMDUMP@TARGET+=eclair
|
||||
LIBS=@LIBS@
|
||||
ARCH=@ARCH@
|
||||
IHKDIR ?= $(VPATH)/../../../ihk/linux/include/
|
||||
MCEXEC_LIBS=-lmcexec -lrt -lnuma -pthread
|
||||
ENABLE_QLMPI=@ENABLE_QLMPI@
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
# Makefile.build.in COPYRIGHT FUJITSU LIMITED 2015-2016
|
||||
ARCH = @ARCH@
|
||||
VPATH=@abs_srcdir@
|
||||
SRC=$(VPATH)
|
||||
IHKDIR=$(IHKBASE)/$(TARGETDIR)
|
||||
@ -37,7 +38,7 @@ OBJCOPY ?= objcopy
|
||||
|
||||
# POSTK_DEBUG_ARCH_DEP_26
|
||||
ifeq ($(ARCH), arm64)
|
||||
SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/ihk CC=$(CC) LD=$(LD) OBJCOPY=$(OBJCOPY) SRC=$(SRC)
|
||||
SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/ihk CC=$(CC) LD=$(LD) OBJCOPY=$(OBJCOPY) SRC=$(SRC) ARCH=$(ARCH)
|
||||
else
|
||||
SUBCMD_OPTS = TARGET=$(TARGET) O=$(CURDIR)/ihk CC=$(CC) LD=$(LD) SRC=$(SRC)
|
||||
endif
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
BUILD_TARGET ?= @TARGET@
|
||||
KERNDIR=@KERNDIR@
|
||||
VPATH=@abs_srcdir@
|
||||
ARCH ?= @ARCH@
|
||||
|
||||
ifeq ($(ARCH), arm64)
|
||||
vdsodir=@abs_builddir@/../arch/$(ARCH)/kernel/vdso
|
||||
|
||||
Reference in New Issue
Block a user