aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@dabbelt.com>2018-11-07 08:19:24 -0800
committerGitHub <noreply@github.com>2018-11-07 08:19:24 -0800
commit6ebd0f2a46255d0c76dad3c05b16c1d154795d26 (patch)
tree8e36c5a762c4882c47e70da610db1cc6cae63a14
parent7bee30c1ff56975041ffc67cd0170d7477aba865 (diff)
parent00f0dd04cbdb670f7e81d7fe5c686cb49e7cd182 (diff)
downloadriscv-pk-6ebd0f2a46255d0c76dad3c05b16c1d154795d26.zip
riscv-pk-6ebd0f2a46255d0c76dad3c05b16c1d154795d26.tar.gz
riscv-pk-6ebd0f2a46255d0c76dad3c05b16c1d154795d26.tar.bz2
Merge pull request #114 from zongbox/mabi
Fix stubs-lp64.h/stubs-lp64d.h/stubs-ilp32.h/stubs-ilp32d.h not found
-rw-r--r--Makefile.in9
1 files changed, 3 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index aeabdc2..376670d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,14 +54,11 @@ endif
# default is. The -with-abi is not necessary for this project. Unconditionally
# compile it with a no-float ABI. i.e., ilp32 for 32-bit and lp64 for 64-bit.
-ifeq (@WITH_ARCH@,)
- march := -march=$(shell @CC@ -v 2>&1 | \
- sed 's/ /\n/g' | grep with-arch | awk -F= '{print $$2}')
-else
+ifneq (@WITH_ARCH@,)
march := -march=@WITH_ARCH@
+ is_32bit := $(findstring 32,$(march))
+ mabi := -mabi=$(if $(is_32bit),ilp32,lp64)
endif
-is_32bit := $(findstring 32,$(march))
-mabi := -mabi=$(if $(is_32bit),ilp32,lp64)
# Installation directories