From 03b0ca6f2ef5855b4cee9fac5d684cde9436a4ab Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 29 Apr 2021 10:47:18 +0200
Subject: [PATCH] CONFIG: trap missing make command in canCompile (#2077)
---
bin/foamInstallationTest | 7 ++++++-
bin/tools/RunFunctions | 14 +++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/bin/foamInstallationTest b/bin/foamInstallationTest
index a3ebbbae095..3949b094374 100755
--- a/bin/foamInstallationTest
+++ b/bin/foamInstallationTest
@@ -7,7 +7,7 @@
# \\/ M anipulation |
#------------------------------------------------------------------------------
# Copyright (C) 2011-2015 OpenFOAM Foundation
-# Copyright (C) 2019-2020 OpenCFD Ltd.
+# Copyright (C) 2019-2021 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -245,6 +245,10 @@ reportExecutable()
VERSION=$(flex --version /dev/null 2>&1 \
| sed -ne 's/flex \([0-9][0-9.]*\).*/\1/p')
;;
+ make)
+ VERSION=$(make --version /dev/null 2>&1 \
+ | sed -ne 's/^.*[Mm]ake \([0-9][0-9.]*\).*/\1/p')
+ ;;
wmake)
VERSION="$(wmake --version 2>/dev/null)"
;;
@@ -442,6 +446,7 @@ hline
echo "$(fixlen Software 12) $(fixlen Version 10) $(fixlen Location 10)"
hline
reportExecutable flex
+reportExecutable make
reportExecutable wmake
for compilerType in c cxx
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 0194f946249..ccb2bc1c103 100644
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@@ -54,13 +54,21 @@ notTest()
}
#
-# Test for wmake and compiler suite or emit warning
+# Test for make/wmake, compiler suite or emit warning
#
canCompile()
{
+ # system
+ if ! command -v make >/dev/null
+ then
+ echo "No system 'make' command found ... cannot compile" 1>&2
+ return 1
+ fi
+
+ # OpenFOAM-specific
if ! command -v wmake >/dev/null
then
- echo "No wmake command found ... cannot compile" 1>&2
+ echo "No openfoam 'wmake' command found ... cannot compile" 1>&2
return 1
fi
@@ -69,7 +77,7 @@ canCompile()
if [ -z "$cxx_compiler" ]
then
- echo "No wmake rule for C++ compiler? ... cannot compile" 1>&2
+ echo "No wmake rule for C++ compiler ... cannot compile" 1>&2
return 1
elif ! command -v "$cxx_compiler" >/dev/null
then
--
GitLab