Skip to content

Commit 2ae542d

Browse files
committed
Output clang root dir instead of 'auto'. Remove trailing spaces and add BSC header
1 parent 3d3962a commit 2ae542d

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

m4/clang.m4

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# This file is part of Nanos6 and is licensed under the terms contained in the COPYING file.
2+
#
3+
# Copyright (C) 2020 Barcelona Supercomputing Center (BSC)
4+
15
AC_DEFUN([SSS_CHECK_NANOS6_CLANG],
26
[
37
AC_ARG_WITH(
@@ -6,7 +10,7 @@ AC_DEFUN([SSS_CHECK_NANOS6_CLANG],
610
[ac_use_nanos6_clang_prefix="${withval}"],
711
[ac_use_nanos6_clang_prefix="auto"]
812
)
9-
13+
1014
if test x"${ac_use_nanos6_clang_prefix}" = x"auto" || test x"${ac_use_nanos6_clang_prefix}" = x"yes" ; then
1115
AC_PATH_PROGS(NANOS6_CLANG, [clang], [])
1216
AC_PATH_PROGS(NANOS6_CLANGXX, [clang++], [])
@@ -18,6 +22,7 @@ AC_DEFUN([SSS_CHECK_NANOS6_CLANG],
1822
ac_have_nanos6_clang=no
1923
fi
2024
else
25+
ac_use_nanos6_clang_prefix=$(echo "${NANOS6_CLANG}" | sed 's@/bin/clang@@')
2126
ac_have_nanos6_clang=yes
2227
fi
2328
elif test x"${ac_use_nanos6_clang_prefix}" != x"no" ; then
@@ -26,27 +31,28 @@ AC_DEFUN([SSS_CHECK_NANOS6_CLANG],
2631
if test x"${NANOS6_CLANG}" = x"" || test x"${NANOS6_CLANGXX}" = x"" ; then
2732
AC_MSG_ERROR([could not find Nanos6 Clang])
2833
else
34+
ac_use_nanos6_clang_prefix=$(echo "${NANOS6_CLANG}" | sed 's@/bin/clang@@')
2935
ac_have_nanos6_clang=yes
3036
fi
3137
else
3238
ac_use_nanos6_clang_prefix=""
3339
ac_have_nanos6_clang=no
3440
fi
35-
41+
3642
AC_MSG_CHECKING([the Nanos6 Clang installation prefix])
3743
if test x"${ac_have_nanos6_clang}" = x"yes" ; then
3844
AC_MSG_RESULT([${ac_use_nanos6_clang_prefix}])
3945
else
4046
AC_MSG_RESULT([not found])
4147
fi
42-
48+
4349
if test x"${NANOS6_CLANG}" != x"" ; then
4450
ac_save_CC="${CC}"
4551
AC_LANG_PUSH(C)
46-
52+
4753
AC_MSG_CHECKING([which flag enables OmpSs-2 support in Clang])
4854
OMPSS2_FLAG=none
49-
55+
5056
CC="${NANOS6_CLANG} -fompss-2"
5157
AC_COMPILE_IFELSE(
5258
[ AC_LANG_SOURCE( [[
@@ -58,7 +64,7 @@ int main(int argc, char ** argv) {
5864
[ OMPSS2_FLAG=-fompss-2 ],
5965
[ ]
6066
)
61-
67+
6268
if test x"${OMPSS2_FLAG}" != x"none" ; then
6369
AC_MSG_RESULT([${OMPSS2_FLAG}])
6470
NANOS6_CLANG="${NANOS6_CLANG} ${OMPSS2_FLAG} --gcc-toolchain=\$(subst bin/gcc,,\$(shell which gcc))"
@@ -72,17 +78,17 @@ int main(int argc, char ** argv) {
7278
unset ac_use_nanos6_clang_prefix
7379
ac_have_nanos6_clang=no
7480
fi
75-
81+
7682
AC_LANG_POP(C)
7783
CC="${ac_save_CC}"
78-
84+
7985
fi
80-
86+
8187
NANOS6_CLANG_PREFIX="${ac_use_nanos6_clang_prefix}"
8288
AC_SUBST([NANOS6_CLANG_PREFIX])
8389
AC_SUBST([NANOS6_CLANG])
8490
AC_SUBST([NANOS6_CLANGXX])
85-
91+
8692
AM_CONDITIONAL(HAVE_NANOS6_CLANG, test x"${ac_have_nanos6_clang}" = x"yes")
8793
]
8894
)

0 commit comments

Comments
 (0)