From 1bc183af8703023e377f92716ecd3f339ffffd11 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <
[email protected]>
Date: Sat, 18 Jul 2020 18:14:50 +0200
Subject: [PATCH] configure: map all arm* toolchain prefixes to arm
Particularly for ARM, toolchains can have a variety of names for the
CPU part of the triplet. "arm", "armhf", "armv7", "armv7l", "armv7a",
etc. etc. etc. This breaks the build as a direct mapping from CPU name
to architecture name in src/libply/arch/ is assumed.
Insert a mangling step in which arm* can all be mapped to arm. We can
extend this in the future for other architectures if necessary.
---
configure.ac | 6 +++++-
src/libply/Makefile.am | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3c814bf..65387d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,10 @@ AC_CONFIG_LIBOBJ_DIR(lib)
AC_REPLACE_FUNCS(qsort_r)
AC_CANONICAL_HOST
-AC_SUBST(host_cpu, $host_cpu)
+AC_SUBST(arch)
+
+AS_CASE($host_cpu,
+ arm*, arch=arm,
+ arch=$host_cpu)
AC_OUTPUT
diff --git a/src/libply/Makefile.am b/src/libply/Makefile.am
index 3c83bb4..05e8082 100644
--- a/src/libply/Makefile.am
+++ b/src/libply/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = grammar.c grammar.h lexer.c lexer.h \
BUILT_SOURCES = grammar.h lexer.h
libply_la_SOURCES = \
- arch/@
[email protected] \
+ arch/@
[email protected] \
\
aux/kallsyms.c \
aux/perf_event.c \
