From 762c095f4ed7c92bb8b90babcb775ddc5cc75812 Mon Sep 17 00:00:00 2001
From: Bernhard Gschaider <>
Date: Tue, 12 Apr 2022 15:27:20 +0200
Subject: [PATCH] COMP: WM_SCHEDULER breaks compilation (fixes #2439)

- only wrap compiler calls (not things like flex/bison)
- avoid single quoted '&&' (causes syntax errors)

STYLE: report WM_COMPILE_CONTROL value in top-level Allwmake
---
 Allwmake                     |  2 +-
 wmake/rules/General/bison    | 26 ++++++++++++--------------
 wmake/rules/General/btyacc   |  8 ++++----
 wmake/rules/General/btyacc++ |  8 ++++----
 wmake/rules/General/byacc    |  8 ++++----
 wmake/rules/General/flex     |  4 ++--
 wmake/rules/General/flex++   |  8 ++++----
 wmake/rules/General/general  |  7 ++-----
 wmake/rules/General/lemon    | 12 ++++++------
 wmake/rules/General/moc      |  4 ++--
 wmake/rules/General/ragel    |  4 ++--
 wmake/rules/General/yacc     | 16 ++++++++--------
 12 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/Allwmake b/Allwmake
index 27f04e6d2e..d34b3665ec 100755
--- a/Allwmake
+++ b/Allwmake
@@ -37,7 +37,7 @@ echo
 echo ========================================
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
 echo "Starting compile ${WM_PROJECT_DIR##*/} ${0##*/}"
-echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler"
+echo "  $WM_COMPILER ${WM_COMPILER_TYPE:-system} compiler [${WM_COMPILE_CONTROL}]"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo ========================================
 echo
diff --git a/wmake/rules/General/bison b/wmake/rules/General/bison
index 9b3862a075..21aab6a4af 100644
--- a/wmake/rules/General/bison
+++ b/wmake/rules/General/bison
@@ -1,26 +1,24 @@
 SUFFIXES += .Y .y .yy .yy-m4
 
 ytoo = $E $(call QUIET_MESSAGE,bison,$(<F)) \
-    $(WM_SCHEDULER) bison -v -d -y $< $(AND) \
-    mv y.tab.c $(@D)/$(<F).c $(AND) \
-    mv y.tab.h $(@D)/$(<F).h $(AND) \
-    $(cc) $(cFLAGS) -c $(@D)/$(<F).c -o $@
+    bison -v -d -y $< && \
+    mv y.tab.c $(@D)/$(<F).c && \
+    mv y.tab.h $(@D)/$(<F).h && \
+    $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $(@D)/$(<F).c -o $@
 
 Ytoo = $E $(call QUIET_MESSAGE,bison,$(<F)) \
-    $(WM_SCHEDULER) bison -v -d -y $< $(AND) \
-    mv y.tab.c $(@D)/$(<F).C $(AND) \
-    mv y.tab.h $(@D)/$(<F).H $(AND) \
-    $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+    bison -v -d -y $< && \
+    mv y.tab.c $(@D)/$(<F).C && \
+    mv y.tab.h $(@D)/$(<F).H && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
 
 yytoo = $E $(call QUIET_MESSAGE,bison,$(<F)) \
-    $(WM_SCHEDULER) $(WM_SCRIPTS)/wrap-bison \
-    -output=$(@D)/$(*F).tab.cc -v -d $< $(AND) \
-    $(CC) $(c++FLAGS) -c $(@D)/$(*F).tab.cc -o $@
+    $(WM_SCRIPTS)/wrap-bison -output=$(@D)/$(*F).tab.cc -v -d $< && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(*F).tab.cc -o $@
 
 # Retains intermediate m4-filtered files (-no-tmp to suppress)
 yy-m4too = $E $(call QUIET_MESSAGE,bison-m4,$(<F)) \
-    $(WM_SCHEDULER) $(WM_SCRIPTS)/wrap-bison \
-    -output=$(@D)/$(*F).tab.cc -v -d $< $(AND) \
-    $(CC) $(c++FLAGS) -c $(@D)/$(*F).tab.cc -o $@
+    $(WM_SCRIPTS)/wrap-bison -output=$(@D)/$(*F).tab.cc -v -d $< && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(*F).tab.cc -o $@
 
 #------------------------------------------------------------------------------
diff --git a/wmake/rules/General/btyacc b/wmake/rules/General/btyacc
index b8b26e0026..203a185406 100644
--- a/wmake/rules/General/btyacc
+++ b/wmake/rules/General/btyacc
@@ -1,7 +1,7 @@
 SUFFIXES += .y
 
 ytoo = $E $(call QUIET_MESSAGE,btyacc,$(<F)) \
-    $(WM_SCHEDULER) btyacc -v -d $(SKELETON) $< $(AND) \
-    mv y_tab.c $(@D)/$(<F).C $(AND) \
-    mv y_tab.h $(@D)/$(<F).H $(AND) \
-    $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+    btyacc -v -d $(SKELETON) $< && \
+    mv y_tab.c $(@D)/$(<F).C && \
+    mv y_tab.h $(@D)/$(<F).H && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
diff --git a/wmake/rules/General/btyacc++ b/wmake/rules/General/btyacc++
index fdbbf78453..a4a742ea22 100644
--- a/wmake/rules/General/btyacc++
+++ b/wmake/rules/General/btyacc++
@@ -1,7 +1,7 @@
 SUFFIXES += .Y
 
 Ytoo = $E $(call QUIET_MESSAGE,btyacc++,$(<F)) \
-    $(WM_SCHEDULER) btyacc++ -v -d $(SKELETON) $< $(AND) \
-    mv y_tab.c $(@D)/$(<F).C $(AND) \
-    mv y_tab.h $(@D)/$(<F).H $(AND) \
-    $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+    btyacc++ -v -d $(SKELETON) $< && \
+    mv y_tab.c $(@D)/$(<F).C && \
+    mv y_tab.h $(@D)/$(<F).H && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
diff --git a/wmake/rules/General/byacc b/wmake/rules/General/byacc
index 093d28745c..f17174b76b 100644
--- a/wmake/rules/General/byacc
+++ b/wmake/rules/General/byacc
@@ -1,7 +1,7 @@
 SUFFIXES += .y
 
 ytoo = $E $(call QUIET_MESSAGE,byacc,$(<F)) \
-    $(WM_SCHEDULER) byacc -v $(YYPREFIX) -d $< $(AND) \
-    mv y.tab.c $(@D)/$(<F).C $(AND) \
-    mv y.tab.h $(@D)/$(<F).H $(AND) \
-    $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+    byacc -v $(YYPREFIX) -d $< && \
+    mv y.tab.c $(@D)/$(<F).C && \
+    mv y.tab.h $(@D)/$(<F).H && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
diff --git a/wmake/rules/General/flex b/wmake/rules/General/flex
index 2685af5c7b..afff022c5a 100644
--- a/wmake/rules/General/flex
+++ b/wmake/rules/General/flex
@@ -1,5 +1,5 @@
 SUFFIXES += .l
 
 ltoo = $E $(call QUIET_MESSAGE,flex,$(<F)) \
-    $(WM_SCHEDULER) flex -f -o $(@D)/$(<F).c $< $(AND) \
-    $(cc) $(cFLAGS) -c $(@D)/$(<F).c -o $@
+    flex -f -o $(@D)/$(<F).c $< && \
+    $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $(@D)/$(<F).c -o $@
diff --git a/wmake/rules/General/flex++ b/wmake/rules/General/flex++
index 1f323a705c..f5484188ed 100644
--- a/wmake/rules/General/flex++
+++ b/wmake/rules/General/flex++
@@ -2,10 +2,10 @@ SUFFIXES += .L .ll
 
 # Use C++-aware Flex
 Ltoo = $E $(call QUIET_MESSAGE,flex++,$(<F)) \
-    $(WM_SCHEDULER) flex -+ -f -o $(@D)/$(<F).C $< $(AND) \
-    $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).C -o $@
+    flex -+ -f -o $(@D)/$(<F).C $< && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).C -o $@
 
 # Use regular (C) Flex, but compile result as C++
 lltoo = $E $(call QUIET_MESSAGE,flex,$(<F)) \
-    $(WM_SCHEDULER) flex -f -o $(@D)/$(<F).cc $< $(AND) \
-    $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).cc -o $@
+    flex -f -o $(@D)/$(<F).cc $< && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).cc -o $@
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index f6d4653e1a..40556a524c 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -37,11 +37,8 @@ ifeq (,$(WM_COMPILE_OPTION))
     WM_COMPILE_OPTION = Opt
 endif
 
-ifeq (,$(WM_SCHEDULER))
-    AND = &&
-else
-    AND = '&&'
-endif
+# Older macro for (shell) branching
+AND := &&
 
 include $(DEFAULT_RULES)/general
 sinclude $(DEFAULT_RULES)/override
diff --git a/wmake/rules/General/lemon b/wmake/rules/General/lemon
index ea1c692a10..8f4e944506 100644
--- a/wmake/rules/General/lemon
+++ b/wmake/rules/General/lemon
@@ -1,16 +1,16 @@
 SUFFIXES += .ly .lyy .lyy-m4
 
 lytoo = $E $(call QUIET_MESSAGE,lemon,$(<F)) \
-    $(WM_SCHEDULER) $(WM_SCRIPTS)/wrap-lemon -d$(@D) $< $(AND) \
-    $(cc) $(cFLAGS) -c $(@D)/$(*F).c -o $@
+    $(WM_SCRIPTS)/wrap-lemon -d$(@D) $< && \
+    $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $(@D)/$(*F).c -o $@
 
 lyytoo = $E $(call QUIET_MESSAGE,lemon,$(<F)) \
-    $(WM_SCHEDULER) $(WM_SCRIPTS)/wrap-lemon -d$(@D) -ecc $< $(AND) \
-    $(CC) $(c++FLAGS) -c $(@D)/$(*F).cc -o $@
+    $(WM_SCRIPTS)/wrap-lemon -d$(@D) -ecc $< && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(*F).cc -o $@
 
 # Retains intermediate m4-filtered files (-no-tmp to suppress)
 lyy-m4too = $E $(call QUIET_MESSAGE,lemon-m4,$(<F)) \
-    $(WM_SCHEDULER) $(WM_SCRIPTS)/wrap-lemon -d$(@D) -ecc $< $(AND) \
-    $(CC) $(c++FLAGS) -c $(@D)/$(*F).cc -o $@
+    $(WM_SCRIPTS)/wrap-lemon -d$(@D) -ecc $< && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(*F).cc -o $@
 
 #------------------------------------------------------------------------------
diff --git a/wmake/rules/General/moc b/wmake/rules/General/moc
index ed1b508d77..7dc73f210c 100644
--- a/wmake/rules/General/moc
+++ b/wmake/rules/General/moc
@@ -1,5 +1,5 @@
 SUFFIXES += .qt
 
 qttoo = $E $(call QUIET_MESSAGE,moc,$(<F)) \
-       $(WM_SCHEDULER) $(QTDIR)/bin/moc -f $< $< -o $(@D)/$(<F).C $(AND) \
-       $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+    $(QTDIR)/bin/moc -f $< $< -o $(@D)/$(<F).C && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
diff --git a/wmake/rules/General/ragel b/wmake/rules/General/ragel
index 58f09c659d..d59c28152d 100644
--- a/wmake/rules/General/ragel
+++ b/wmake/rules/General/ragel
@@ -1,5 +1,5 @@
 SUFFIXES += .rl
 
 rltoo = $E $(call QUIET_MESSAGE,ragel,$(<F)) \
-    $(WM_SCHEDULER) ragel -G2 -o$(@D)/$(<F).cc $< $(AND) \
-    $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).cc -o $@
+    ragel -G2 -o$(@D)/$(<F).cc $< && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).cc -o $@
diff --git a/wmake/rules/General/yacc b/wmake/rules/General/yacc
index 0daacdbb89..d21f5d86fc 100644
--- a/wmake/rules/General/yacc
+++ b/wmake/rules/General/yacc
@@ -1,13 +1,13 @@
 SUFFIXES += .y .Y
 
 ytoo = $E $(call QUIET_MESSAGE,yacc,$(<F)) \
-    $(WM_SCHEDULER) yacc -v -d $< $(AND) \
-    mv y.tab.c $(@D)/$(<F).c $(AND) \
-    mv y.tab.h $(@D)/parser.h $(AND) \
-    $(CC) $(c++FLAGS) -c $(@D)/$(<F).c -o $@
+    yacc -v -d $< && \
+    mv y.tab.c $(@D)/$(<F).c && \
+    mv y.tab.h $(@D)/parser.h && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).c -o $@
 
 Ytoo = $E $(call QUIET_MESSAGE,yacc,$(<F)) \
-    $(WM_SCHEDULER) yacc -v -d $< $(AND) \
-    mv y.tab.c $(@D)/$(<F).C $(AND) \
-    mv y.tab.h $(@D)/parser.H $(AND) \
-    $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
+    yacc -v -d $< && \
+    mv y.tab.c $(@D)/$(<F).C && \
+    mv y.tab.h $(@D)/parser.H && \
+    $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@