Merge pull request #10792 from jolivain/fix_ompi_wrapper_script_for_main

Fix script ompi/tools/wrappers/ompi_wrapper_script.in (for main branch)

Author: jsquyres

ompi/tools/wrappers/ompi_wrapper_script.in

@@ -39,7 +39,7 @@ my $CXX = "@CXX@";
 my $FC = "@FC@";
 my $wrapper_cppflags = "@OMPI_WRAPPER_CPPFLAGS@";
 my $wrapper_cflags = "@OMPI_WRAPPER_CFLAGS@";
-my $wrapper_wrapper_cflags_prefix = "@OMPI_WRAPPER_CFLAGS_PREFIX@";
+my $wrapper_cflags_prefix = "@OMPI_WRAPPER_CFLAGS_PREFIX@";
 my $wrapper_cxxflags = "@OMPI_WRAPPER_CXXFLAGS@";
 my $wrapper_cxxflags_prefix = "@OMPI_WRAPPER_CXXFLAGS_PREFIX@";
 my $wrapper_fcflags = "@OMPI_WRAPPER_FCFLAGS@";
@@ -64,21 +64,21 @@ my $libs = "";
 my $libs_static = "";
 
 # run flags through regex to fix directories...
-$cppflags =~ s/\$\{includedir\}/$includedir/g;
-$cflags =~ s/\$\{includedir\}/$includedir/g;
-$cflags_prefix =~ s/\$\{includedir\}/$includedir/g;
-$cxxflags =~ s/\$\{includedir\}/$includedir/g;
-$cxxflags_prefix =~ s/\$\{includedir\}/$includedir/g;
-$fcflags =~ s/\$\{includedir\}/$includedir/g;
-$fcflags_prefix =~ s/\$\{includedir\}/$includedir/g;
-$ldflags =~ s/\$\{libdir\}/$libdir/g;
-$ldflags_static =~ s/\$\{libdir\}/$libdir/g;
-$libs =~ s/\$\{libdir\}/$libdir/g;
-$libs_static =~ s/\$\{libdir\}/$libdir/g;
-$fc_ldflags =~ s/\$\{libdir\}/$libdir/g;
-$fc_ldflags_static =~ s/\$\{libdir\}/$libdir/g;
-$fc_libs =~ s/\$\{libdir\}/$libdir/g;
-$fc_libs_static =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_cppflags =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_cflags =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_cflags_prefix =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_cxxflags =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_cxxflags_prefix =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_fcflags =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_fcflags_prefix =~ s/\$\{includedir\}/$includedir/g;
+$wrapper_ldflags =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_ldflags_static =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_libs =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_libs_static =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_fc_ldflags =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_fc_ldflags_static =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_fc_libs =~ s/\$\{libdir\}/$libdir/g;
+$wrapper_fc_libs_static =~ s/\$\{libdir\}/$libdir/g;
 
 sub check_env {
     my $envvar = shift;
@@ -103,17 +103,17 @@ if (basename($0) eq "mpicc") {
     $comp_flags = $wrapper_cflags;
     $comp_flags_prefix = $wrapper_cflags_prefix;
     $linker_flags = $wrapper_ldflags;
-    $linker_flags_static = $wrapper_ldflags_static
+    $linker_flags_static = $wrapper_ldflags_static;
     $libs = $wrapper_libs;
     $libs_static = $wrapper_libs_static;
 } elsif (basename($0) eq "mpic++" || basename($0) eq "mpiCC" || basename($0) eq "mpicxx") {
     $lang = "C++";
     $comp = check_env("CXX", $CXX);
     $preproc_flags = $wrapper_cppflags;
-    $comp_flags = $wrapper_cxxflags
+    $comp_flags = $wrapper_cxxflags;
     $comp_flags_prefix = $wrapper_cxxflags_prefix;
     $linker_flags = $wrapper_ldflags;
-    $linker_flags_static = $wrapper_ldflags_static
+    $linker_flags_static = $wrapper_ldflags_static;
     $libs = $wrapper_libs;
     $libs_static = $wrapper_libs_static;
 }
@@ -123,10 +123,10 @@ elsif (basename($0) eq "mpifort" ||
     $lang = "Fortran";
     $comp = check_env("FC", $FC);
     $preproc_flags = $wrapper_cppflags;
-    $comp_flags = $wrapper_fcflags
+    $comp_flags = $wrapper_fcflags;
     $comp_flags_prefix = $wrapper_fcflags_prefix;
     $linker_flags = $wrapper_fc_ldflags;
-    $linker_flags_static = $wrapper_fc_ldflags_static
+    $linker_flags_static = $wrapper_fc_ldflags_static;
     $libs = $wrapper_fc_libs;
     $libs_static = $wrapper_fc_libs_static;
 }
@@ -203,7 +203,7 @@ if ($disable_flags == 1 && !($dry_run == 1 && $real_flag == 0)) {
     $want_preproc = $want_compile = $want_link = 0;
 }
 
-if ($want_static == 1 || $have_dynamic == 0) {
+if ($want_static == 1) {
     $libs = $libs_static;
     $linker_flags = $linker_flags_static;
 }