|
6 | 6 | # Copyright (c) 2011-2015 INRIA. All rights reserved.
|
7 | 7 | # Copyright (c) 2011-2015 Universite Bordeaux 1
|
8 | 8 | # Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
|
9 |
| -# Copyright (c) 2015 Intel, Inc. All rights reserved. |
| 9 | +# Copyright (c) 2015 Intel, Inc. All rights reserved. |
| 10 | +# Copyright (c) 2019 Research Organization for Information Science |
| 11 | +# and Technology (RIST). All rights reserved. |
10 | 12 | # $COPYRIGHT$
|
11 | 13 | #
|
12 | 14 | # Additional copyrights may follow
|
@@ -77,7 +79,21 @@ AC_DEFUN([MCA_ompi_topo_treematch_CONFIG], [
|
77 | 79 | [ompi_topo_treematch_happy=1])])])
|
78 | 80 |
|
79 | 81 | AS_IF([test $ompi_topo_treematch_happy -eq 1],
|
80 |
| - [$1], |
| 82 | + [AS_IF([test "x$treematch_files_local" = "xyes"], |
| 83 | + [AS_IF([! test -d $OMPI_TOP_BUILDDIR/ompi/mca/topo/treematch], |
| 84 | + [mkdir -p $OMPI_TOP_BUILDDIR/ompi/mca/topo/treematch]) |
| 85 | + cat > $OMPI_TOP_BUILDDIR/ompi/mca/topo/treematch/config.h << EOF |
| 86 | +/* |
| 87 | + * This file is automatically generated by configure. Edits will be lost |
| 88 | + * |
| 89 | + * This is an dummy config.h in order to prevent the embedded treematch from using |
| 90 | + * the config.h from the embedded hwloc |
| 91 | + * |
| 92 | + * see https://github.com/open-mpi/ompi/pull/6185#issuecomment-458807930 |
| 93 | + */ |
| 94 | +EOF |
| 95 | + ]) |
| 96 | + $1], |
81 | 97 | [AS_IF([test ! -z "$with_treematch" && test "$with_treematch" != "no"],
|
82 | 98 | [AC_MSG_ERROR([TreeMatch support requested but not found. Aborting])])
|
83 | 99 | $2])
|
|
0 commit comments