From 16426420b5d6bbf16c035503dd7d9eabd91e3f04 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Fri, 15 Feb 2019 14:56:53 -0800 Subject: Makefile: Fix the assignment of OPENSBI_CC_XLEN Previously OPENSBI_CC_XLEN was not being correctly assigned either 32 or 64. It also was not assigned before config.mk was parsed. Ensure that it will always be assigned. Signed-off-by: Alistair Francis --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2433085..c1ac54c 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,9 @@ export firmware_dir=$(CURDIR)/firmware OPENSBI_VERSION_MAJOR=`grep MAJOR $(include_dir)/sbi/sbi_version.h | awk '{ print $$3 }'` OPENSBI_VERSION_MINOR=`grep MINOR $(include_dir)/sbi/sbi_version.h | awk '{ print $$3 }'` +# Guess the compillers xlen +OPENSBI_CC_XLEN := $(shell TMP=`$(CC) -dumpmachine`; echo $${TMP:5:2}) + # Setup list of objects.mk files ifdef PLATFORM platform-object-mks=$(shell if [ -d $(platform_dir) ]; then find $(platform_dir) -iname "objects.mk" | sort -r; fi) @@ -116,9 +119,6 @@ endif AS = $(CC) DTC = dtc -# Guess the compillers xlen -OPENSBI_CC_XLEN = `expr substr \`$(CC) -dumpmachine\` 6 2` - # Setup platform XLEN, ABI, ISA and Code Model ifndef PLATFORM_RISCV_XLEN ifeq ($(OPENSBI_CC_XLEN), 32) -- cgit v1.1