Merge pull request #2331 from ComputeCanada/fix_openfoam_hardcoded_cpp

added regex to replace /lib/cpp with cpp in OpenFOAM's wmake rules file

easybuild/easyblocks/o/openfoam.py

@@ -197,6 +197,7 @@ def configure_step(self):
         # that would change the cOPT/c++OPT values from their empty setting.
         suffixes = ['', 'Opt']
         wmake_rules_files = [os.path.join(ldir, lang + suff) for ldir in ldirs for lang in langs for suff in suffixes]
+        wmake_rules_files += [os.path.join(ldir, "general") for ldir in ldirs]
 
         mpicc = os.environ['MPICC']
         mpicxx = os.environ['MPICXX']
@@ -228,6 +229,8 @@ def configure_step(self):
             regex_subs = []
             for comp_var, newval in comp_vars.items():
                 regex_subs.append((r"^(%s\s*=\s*).*$" % re.escape(comp_var), r"\1%s" % newval))
+            # replace /lib/cpp by cpp, but keep the arguments
+            regex_subs.append((r"^(CPP\s*=\s*)/lib/cpp(.*)$", r"\1cpp\2"))
             apply_regex_substitutions(fullpath, regex_subs)
 
         # enable verbose build for debug purposes