Ensure the wrapper compilers detect and respect OPAL_PREFIX
This commit was SVN r21953.
Этот коммит содержится в:
родитель
130d15384f
Коммит
3acdb53494
@ -2,9 +2,21 @@
|
||||
# -*- perl -*-
|
||||
|
||||
use File::Basename;
|
||||
use File::Spec::Functions;
|
||||
|
||||
my $includedir = "@OMPI_WRAPPER_INCLUDEDIR@";
|
||||
my $libdir = "@OMPI_WRAPPER_LIBDIR@";
|
||||
|
||||
# obey the OPAL_DESTDIR environmant variable
|
||||
if (exists($ENV{'OPAL_DESTDIR'})
|
||||
&& defined($ENV{'OPAL_DESTDIR'})
|
||||
&& (length($ENV{'OPAL_DESTDIR'}) > 0)) {
|
||||
my $ddir = $ENV{'OPAL_DESTDIR'};
|
||||
|
||||
$includedir = catdir($ddir, $includedir);
|
||||
$libdir = catdir($ddir, $libdir);
|
||||
}
|
||||
|
||||
my $CC = "@CC@";
|
||||
my $CXX = "@CXX@";
|
||||
my $F77 = "@F77@";
|
||||
@ -50,7 +62,7 @@ sub add_extra_includes {
|
||||
my $str = "";
|
||||
my @includes = split(' ', $extra_includes);
|
||||
for my $include (@includes) {
|
||||
$str .= $include_flag . $include . " ";
|
||||
$str .= $include_flag . catdir($includedir, $include) . " ";
|
||||
}
|
||||
|
||||
return $str;
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user