zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: WM_SCHEDULER breaks compilation (fixes #2439)

Browse Source 
- 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
This commit is contained in:
Bernhard Gschaider
2022-04-12 15:27:20 +02:00
committed by Mark Olesen
parent ebc634a425
commit 762c095f4e
12 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Allwmake
View File

@ -37,7 +37,7 @@ echo
echo ======================================== echo ========================================
date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown" date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
echo "Starting compile ${WM_PROJECT_DIR##*/} ${0##*/}" 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 " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
echo ======================================== echo ========================================
echo echo

26
wmake/rules/General/bison
View File

@ -1,26 +1,24 @@
SUFFIXES += .Y .y .yy .yy-m4 SUFFIXES += .Y .y .yy .yy-m4
ytoo = $E $(call QUIET_MESSAGE,bison,$(<F)) \ ytoo = $E $(call QUIET_MESSAGE,bison,$(<F)) \
$(WM_SCHEDULER) bison -v -d -y $< $(AND) \ bison -v -d -y $< && \
mv y.tab.c $(@D)/$(<F).c $(AND) \ mv y.tab.c $(@D)/$(<F).c && \
mv y.tab.h $(@D)/$(<F).h $(AND) \ mv y.tab.h $(@D)/$(<F).h && \
$(cc) $(cFLAGS) -c $(@D)/$(<F).c -o $@ $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $(@D)/$(<F).c -o $@
Ytoo = $E $(call QUIET_MESSAGE,bison,$(<F)) \ Ytoo = $E $(call QUIET_MESSAGE,bison,$(<F)) \
$(WM_SCHEDULER) bison -v -d -y $< $(AND) \ bison -v -d -y $< && \
mv y.tab.c $(@D)/$(<F).C $(AND) \ mv y.tab.c $(@D)/$(<F).C && \
mv y.tab.h $(@D)/$(<F).H $(AND) \ mv y.tab.h $(@D)/$(<F).H && \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@
yytoo = $E $(call QUIET_MESSAGE,bison,$(<F)) \ yytoo = $E $(call QUIET_MESSAGE,bison,$(<F)) \
$(WM_SCHEDULER) $(WM_SCRIPTS)/wrap-bison \ $(WM_SCRIPTS)/wrap-bison -output=$(@D)/$(*F).tab.cc -v -d $< && \
-output=$(@D)/$(*F).tab.cc -v -d $< $(AND) \ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(*F).tab.cc -o $@
$(CC) $(c++FLAGS) -c $(@D)/$(*F).tab.cc -o $@
# Retains intermediate m4-filtered files (-no-tmp to suppress) # Retains intermediate m4-filtered files (-no-tmp to suppress)
yy-m4too = $E $(call QUIET_MESSAGE,bison-m4,$(<F)) \ yy-m4too = $E $(call QUIET_MESSAGE,bison-m4,$(<F)) \
$(WM_SCHEDULER) $(WM_SCRIPTS)/wrap-bison \ $(WM_SCRIPTS)/wrap-bison -output=$(@D)/$(*F).tab.cc -v -d $< && \
-output=$(@D)/$(*F).tab.cc -v -d $< $(AND) \ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(*F).tab.cc -o $@
$(CC) $(c++FLAGS) -c $(@D)/$(*F).tab.cc -o $@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

8
wmake/rules/General/btyacc
View File

@ -1,7 +1,7 @@
SUFFIXES += .y SUFFIXES += .y
ytoo = $E $(call QUIET_MESSAGE,btyacc,$(<F)) \ ytoo = $E $(call QUIET_MESSAGE,btyacc,$(<F)) \
$(WM_SCHEDULER) btyacc -v -d $(SKELETON) $< $(AND) \ btyacc -v -d $(SKELETON) $< && \
mv y_tab.c $(@D)/$(<F).C $(AND) \ mv y_tab.c $(@D)/$(<F).C && \
mv y_tab.h $(@D)/$(<F).H $(AND) \ mv y_tab.h $(@D)/$(<F).H && \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@

8
wmake/rules/General/btyacc++
View File

@ -1,7 +1,7 @@
SUFFIXES += .Y SUFFIXES += .Y
Ytoo = $E $(call QUIET_MESSAGE,btyacc++,$(<F)) \ Ytoo = $E $(call QUIET_MESSAGE,btyacc++,$(<F)) \
$(WM_SCHEDULER) btyacc++ -v -d $(SKELETON) $< $(AND) \ btyacc++ -v -d $(SKELETON) $< && \
mv y_tab.c $(@D)/$(<F).C $(AND) \ mv y_tab.c $(@D)/$(<F).C && \
mv y_tab.h $(@D)/$(<F).H $(AND) \ mv y_tab.h $(@D)/$(<F).H && \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@

8
wmake/rules/General/byacc
View File

@ -1,7 +1,7 @@
SUFFIXES += .y SUFFIXES += .y
ytoo = $E $(call QUIET_MESSAGE,byacc,$(<F)) \ ytoo = $E $(call QUIET_MESSAGE,byacc,$(<F)) \
$(WM_SCHEDULER) byacc -v $(YYPREFIX) -d $< $(AND) \ byacc -v $(YYPREFIX) -d $< && \
mv y.tab.c $(@D)/$(<F).C $(AND) \ mv y.tab.c $(@D)/$(<F).C && \
mv y.tab.h $(@D)/$(<F).H $(AND) \ mv y.tab.h $(@D)/$(<F).H && \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@

4
wmake/rules/General/flex
View File

@ -1,5 +1,5 @@
SUFFIXES += .l SUFFIXES += .l
ltoo = $E $(call QUIET_MESSAGE,flex,$(<F)) \ ltoo = $E $(call QUIET_MESSAGE,flex,$(<F)) \
$(WM_SCHEDULER) flex -f -o $(@D)/$(<F).c $< $(AND) \ flex -f -o $(@D)/$(<F).c $< && \
$(cc) $(cFLAGS) -c $(@D)/$(<F).c -o $@ $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $(@D)/$(<F).c -o $@

8
wmake/rules/General/flex++
View File

@ -2,10 +2,10 @@ SUFFIXES += .L .ll
# Use C++-aware Flex # Use C++-aware Flex
Ltoo = $E $(call QUIET_MESSAGE,flex++,$(<F)) \ Ltoo = $E $(call QUIET_MESSAGE,flex++,$(<F)) \
$(WM_SCHEDULER) flex -+ -f -o $(@D)/$(<F).C $< $(AND) \ flex -+ -f -o $(@D)/$(<F).C $< && \
$(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).C -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).C -o $@
# Use regular (C) Flex, but compile result as C++ # Use regular (C) Flex, but compile result as C++
lltoo = $E $(call QUIET_MESSAGE,flex,$(<F)) \ lltoo = $E $(call QUIET_MESSAGE,flex,$(<F)) \
$(WM_SCHEDULER) flex -f -o $(@D)/$(<F).cc $< $(AND) \ flex -f -o $(@D)/$(<F).cc $< && \
$(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).cc -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).cc -o $@

7
wmake/rules/General/general
View File

@ -37,11 +37,8 @@ ifeq (,$(WM_COMPILE_OPTION))
WM_COMPILE_OPTION = Opt WM_COMPILE_OPTION = Opt
endif endif
ifeq (,$(WM_SCHEDULER)) # Older macro for (shell) branching
AND = && AND := &&
else
AND = '&&'
endif
include $(DEFAULT_RULES)/general include $(DEFAULT_RULES)/general
sinclude $(DEFAULT_RULES)/override sinclude $(DEFAULT_RULES)/override

12
wmake/rules/General/lemon
View File

@ -1,16 +1,16 @@
SUFFIXES += .ly .lyy .lyy-m4 SUFFIXES += .ly .lyy .lyy-m4
lytoo = $E $(call QUIET_MESSAGE,lemon,$(<F)) \ lytoo = $E $(call QUIET_MESSAGE,lemon,$(<F)) \
$(WM_SCHEDULER) $(WM_SCRIPTS)/wrap-lemon -d$(@D) $< $(AND) \ $(WM_SCRIPTS)/wrap-lemon -d$(@D) $< && \
$(cc) $(cFLAGS) -c $(@D)/$(*F).c -o $@ $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $(@D)/$(*F).c -o $@
lyytoo = $E $(call QUIET_MESSAGE,lemon,$(<F)) \ lyytoo = $E $(call QUIET_MESSAGE,lemon,$(<F)) \
$(WM_SCHEDULER) $(WM_SCRIPTS)/wrap-lemon -d$(@D) -ecc $< $(AND) \ $(WM_SCRIPTS)/wrap-lemon -d$(@D) -ecc $< && \
$(CC) $(c++FLAGS) -c $(@D)/$(*F).cc -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(*F).cc -o $@
# Retains intermediate m4-filtered files (-no-tmp to suppress) # Retains intermediate m4-filtered files (-no-tmp to suppress)
lyy-m4too = $E $(call QUIET_MESSAGE,lemon-m4,$(<F)) \ lyy-m4too = $E $(call QUIET_MESSAGE,lemon-m4,$(<F)) \
$(WM_SCHEDULER) $(WM_SCRIPTS)/wrap-lemon -d$(@D) -ecc $< $(AND) \ $(WM_SCRIPTS)/wrap-lemon -d$(@D) -ecc $< && \
$(CC) $(c++FLAGS) -c $(@D)/$(*F).cc -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(*F).cc -o $@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

4
wmake/rules/General/moc
View File

@ -1,5 +1,5 @@
SUFFIXES += .qt SUFFIXES += .qt
qttoo = $E $(call QUIET_MESSAGE,moc,$(<F)) \ qttoo = $E $(call QUIET_MESSAGE,moc,$(<F)) \
$(WM_SCHEDULER) $(QTDIR)/bin/moc -f $< $< -o $(@D)/$(<F).C $(AND) \ $(QTDIR)/bin/moc -f $< $< -o $(@D)/$(<F).C && \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@

4
wmake/rules/General/ragel
View File

@ -1,5 +1,5 @@
SUFFIXES += .rl SUFFIXES += .rl
rltoo = $E $(call QUIET_MESSAGE,ragel,$(<F)) \ rltoo = $E $(call QUIET_MESSAGE,ragel,$(<F)) \
$(WM_SCHEDULER) ragel -G2 -o$(@D)/$(<F).cc $< $(AND) \ ragel -G2 -o$(@D)/$(<F).cc $< && \
$(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).cc -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) $(c++LESSWARN) -c $(@D)/$(<F).cc -o $@

16
wmake/rules/General/yacc
View File

@ -1,13 +1,13 @@
SUFFIXES += .y .Y SUFFIXES += .y .Y
ytoo = $E $(call QUIET_MESSAGE,yacc,$(<F)) \ ytoo = $E $(call QUIET_MESSAGE,yacc,$(<F)) \
$(WM_SCHEDULER) yacc -v -d $< $(AND) \ yacc -v -d $< && \
mv y.tab.c $(@D)/$(<F).c $(AND) \ mv y.tab.c $(@D)/$(<F).c && \
mv y.tab.h $(@D)/parser.h $(AND) \ mv y.tab.h $(@D)/parser.h && \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).c -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).c -o $@
Ytoo = $E $(call QUIET_MESSAGE,yacc,$(<F)) \ Ytoo = $E $(call QUIET_MESSAGE,yacc,$(<F)) \
$(WM_SCHEDULER) yacc -v -d $< $(AND) \ yacc -v -d $< && \
mv y.tab.c $(@D)/$(<F).C $(AND) \ mv y.tab.c $(@D)/$(<F).C && \
mv y.tab.h $(@D)/parser.H $(AND) \ mv y.tab.h $(@D)/parser.H && \
$(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@ $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $(@D)/$(<F).C -o $@