From: Paul Osmialowski <address@hidden>
Signed-off-by: Paul Osmialowski <address@hidden>
---
build-aux/config.rpath | 3 +++
m4/std-gnu11.m4 | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index af3c41559..4e0419c9c 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -79,6 +79,9 @@ else
nagfor*)
wl='-Wl,-Wl,,'
;;
+ armflang* | flang*)
+ wl='-Wl,'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
wl='-Wl,'
;;
diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4
index 9dae9b1cc..87e8df7e5 100644
--- a/m4/std-gnu11.m4
+++ b/m4/std-gnu11.m4
@@ -59,6 +59,9 @@ if test -z "$CC"; then
AC_CHECK_TOOLS(CC, cl.exe)
fi
if test -z "$CC"; then
+ AC_CHECK_TOOL(CC, armclang)
+fi
+if test -z "$CC"; then
AC_CHECK_TOOL(CC, clang)
fi
])
@@ -126,7 +129,7 @@ if test -z "$CXX"; then
else
AC_CHECK_TOOLS(CXX,
[m4_default([$1],
- [g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC
xlC_r xlC clang++])],
+ [g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC
xlC_r xlC armclang++ clang++])],
g++)
fi
fi