Fix for ticket #179. Print a reasonable error message if we fail to parse
the compiler data file. Also, actually fix the bug by expanding out datarootdir before letting it get in install_dirs.h. This commit was SVN r10643.
Этот коммит содержится в:
родитель
47725c9b02
Коммит
27d9e26721
@ -27,12 +27,14 @@
|
||||
AC_DEFUN([OMPI_INSTALL_DIRS], [
|
||||
ompi_exec_prefix_save="$exec_prefix"
|
||||
ompi_prefix_save="$prefix"
|
||||
ompi_datarootdir_save="$datarootdir"
|
||||
|
||||
# need to temporarily expand this out as almost exactly as it will
|
||||
# be done later so that NONE doesn't show up in the
|
||||
# {exec_}prefix-based variables.
|
||||
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
test "x$exec_prefix" = xNONE && exec_prefix="$prefix"
|
||||
eval datarootdir="$datarootdir"
|
||||
|
||||
OPAL_PREFIX="$prefix"
|
||||
OPAL_EXEC_PREFIX="$exec_prefix"
|
||||
@ -64,6 +66,7 @@ AC_DEFUN([OMPI_INSTALL_DIRS], [
|
||||
|
||||
prefix="$ompi_prefix_save"
|
||||
exec_prefix="$ompi_exec_prefix_save"
|
||||
datarootdir="$ompi_datarootdir_save"
|
||||
|
||||
AC_CONFIG_FILES([$1])
|
||||
])dnl
|
||||
|
@ -43,6 +43,7 @@
|
||||
#include "opal/runtime/opal.h"
|
||||
#include "opal/constants.h"
|
||||
#include "opal/util/argv.h"
|
||||
#include "opal/util/error.h"
|
||||
#include "opal/util/keyval_parse.h"
|
||||
#include "opal/util/show_help.h"
|
||||
#include "opal/util/path.h"
|
||||
@ -295,6 +296,7 @@ main(int argc, char *argv[])
|
||||
|
||||
base_argv0 = strdup(basename(argv[0]));
|
||||
if (OPAL_SUCCESS != (ret = data_init(base_argv0))) {
|
||||
fprintf(stderr, "Error parsing data file: %s\n", opal_strerror(ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user