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

ENH: support libz disabling via WM_COMPILE_CONTROL (as ~libz)

Browse Source 
- eg, for partially incomplete systems (without libz devel header)

ENH: clearer binding of dummy Pstream in OpenFOAM/Make/options

- link of dummy stub Pstream now contingent on linking libOpenFOAM as
  well. This makes the purpose slightly clearer

ENH: cleaner option naming/handling in wmake script

- allow special purpose -no-openfoam option.
  Eg, compiling test programs without OpenFOAM and Pstream libraries
  but using the rest of the wmake system.

ENH: add +openmp support into WM_COMPILE_CONTROL (#2633)

- this adds compile/link flags for openmp.
  For single-use, can also use 'wmake -openmp'.

  If both +openmp and ~openmp are specified in WM_COMPILE_CONTROL
  the ~openmp will have priority.

  This is actually done indirectly since ~openmp will set empty
  COMP_OPENMP, LINK_OPENMP internal variables, which the +openmp then
  adds to the c++FLAGS and linkexe targets (ie, won't actually add
  anything).

ENH: add +ccache or ccache=... support into WM_COMPILE_CONTROL (#2633)

- with the first version (+ccache), simply use ccache from the path
  without any extra options.

- with the second version (ccache=...), can be more specific about
  what is called.

  Using "+ccache" is identical to "ccache=ccache", but the later could
  be used in other ways. For example,

     ccache=/strange/install/path/ccache
     ccache=</path/my-tooling --option>

  Have the choice of unquoted, single or double quoted or '< >' quoted

STYLE: relocate FOAM_EXTRA_LDFLAGS in general makefile

- removes clutter for different linkers (eg, gold, mold, ldd)
  making it easier to extend for other linkers.

STYLE: protect makefile checks with 'strip' function
This commit is contained in:
Mark Olesen
2022-11-01 12:15:08 +01:00
parent e15b103003
commit 9f7cfa9419
76 changed files with 430 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wmake/rules/General/Amd/link-c
View File

@ -1,5 +1,9 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker -z -Xlinker nodefs
#------------------------------------------------------------------------------

16
wmake/rules/General/Amd/link-c++
View File

@ -1,8 +1,14 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(c++DBUG) -Wl,--as-needed
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
$(FOAM_EXTRA_LDFLAGS)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) \
-L$(FOAM_LIBBIN)/dummy -lPstream \
$(FOAM_EXTRA_LDFLAGS)
LINKEXE = $(CC) $(c++FLAGS)
# Link dummy stub to resolve libPstream symbols used by libOpenFOAM
ifneq (,$(findstring -lOpenFOAM,$(PROJECT_LIBS)))
LINKEXE += -L$(FOAM_LIBBIN)/dummy -lPstream
endif
#------------------------------------------------------------------------------

2
wmake/rules/General/Clang/c++
View File

@ -26,7 +26,7 @@ c++LESSWARN = \
-Wno-unknown-warning-option \
-Wno-deprecated-copy-with-user-provided-copy \
-Wno-tautological-overlap-compare \
-Wno-#pragma-messages
-Wno-\#pragma-messages
# Tuning
sinclude $(GENERAL_RULES)/common/c++$(WM_COMPILE_OPTION)

4
wmake/rules/General/Clang/link-c
View File

@ -1,5 +1,9 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
#------------------------------------------------------------------------------

10
wmake/rules/General/Clang/link-c++
View File

@ -1,8 +1,10 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
$(FOAM_EXTRA_LDFLAGS)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) \
-Xlinker --add-needed \
$(FOAM_EXTRA_LDFLAGS)
-Xlinker --add-needed
#------------------------------------------------------------------------------

16
wmake/rules/General/Clang/link-gold-c++
View File

@ -1,10 +1,16 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
-fuse-ld=gold \
$(FOAM_EXTRA_LDFLAGS)
-fuse-ld=gold
LINKEXE = $(CC) $(c++FLAGS) \
-fuse-ld=gold \
-L$(FOAM_LIBBIN)/dummy -lPstream \
$(FOAM_EXTRA_LDFLAGS)
-fuse-ld=gold
# Link dummy stub to resolve libPstream symbols used by libOpenFOAM
ifneq (,$(findstring -lOpenFOAM,$(PROJECT_LIBS)))
LINKEXE += -L$(FOAM_LIBBIN)/dummy -lPstream
endif
#------------------------------------------------------------------------------

16
wmake/rules/General/Clang/link-lld-c++
View File

@ -1,10 +1,16 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
-fuse-ld=lld \
$(FOAM_EXTRA_LDFLAGS)
-fuse-ld=lld
LINKEXE = $(CC) $(c++FLAGS) \
-fuse-ld=lld \
-L$(FOAM_LIBBIN)/dummy -lPstream \
$(FOAM_EXTRA_LDFLAGS)
-fuse-ld=lld
# Link dummy stub to resolve libPstream symbols used by libOpenFOAM
ifneq (,$(findstring -lOpenFOAM,$(PROJECT_LIBS)))
LINKEXE += -L$(FOAM_LIBBIN)/dummy -lPstream
endif
#------------------------------------------------------------------------------

16
wmake/rules/General/Clang/link-mold-c++
View File

@ -1,10 +1,16 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
-fuse-ld=mold \
$(FOAM_EXTRA_LDFLAGS)
-fuse-ld=mold
LINKEXE = $(CC) $(c++FLAGS) \
-fuse-ld=mold \
-L$(FOAM_LIBBIN)/dummy -lPstream \
$(FOAM_EXTRA_LDFLAGS)
-fuse-ld=mold
# Link dummy stub to resolve libPstream symbols used by libOpenFOAM
ifneq (,$(findstring -lOpenFOAM,$(PROJECT_LIBS)))
LINKEXE += -L$(FOAM_LIBBIN)/dummy -lPstream
endif
#------------------------------------------------------------------------------

4
wmake/rules/General/Gcc/link-c
View File

@ -1,5 +1,9 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
#------------------------------------------------------------------------------

10
wmake/rules/General/Gcc/link-c++
View File

@ -1,11 +1,13 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
-Xlinker --add-needed \
-Xlinker --no-as-needed \
$(FOAM_EXTRA_LDFLAGS)
-Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) \
-Xlinker --add-needed \
-Xlinker --no-as-needed \
$(FOAM_EXTRA_LDFLAGS)
-Xlinker --no-as-needed
#------------------------------------------------------------------------------

16
wmake/rules/General/Gcc/link-gold-c++
View File

@ -1,10 +1,16 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
-fuse-ld=gold \
$(FOAM_EXTRA_LDFLAGS)
-fuse-ld=gold
LINKEXE = $(CC) $(c++FLAGS) \
-fuse-ld=gold \
-L$(FOAM_LIBBIN)/dummy -lPstream \
$(FOAM_EXTRA_LDFLAGS)
-fuse-ld=gold
# Link dummy stub to resolve libPstream symbols used by libOpenFOAM
ifneq (,$(findstring -lOpenFOAM,$(PROJECT_LIBS)))
LINKEXE += -L$(FOAM_LIBBIN)/dummy -lPstream
endif
#------------------------------------------------------------------------------

4
wmake/rules/General/Icc/link-c
View File

@ -1,5 +1,9 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cFLAGS) -shared
LINKEXE = $(cc) $(cFLAGS) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
#------------------------------------------------------------------------------

10
wmake/rules/General/Icc/link-c++
View File

@ -1,11 +1,13 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
-Xlinker --add-needed \
-Xlinker --no-as-needed \
$(FOAM_EXTRA_LDFLAGS)
-Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) \
-Xlinker --add-needed \
-Xlinker --no-as-needed \
$(FOAM_EXTRA_LDFLAGS)
-Xlinker --no-as-needed
#------------------------------------------------------------------------------

4
wmake/rules/General/Icx/link-c
View File

@ -1,5 +1,9 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cFLAGS) -shared
LINKEXE = $(cc) $(cFLAGS) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
#------------------------------------------------------------------------------

10
wmake/rules/General/Icx/link-c++
View File

@ -1,11 +1,13 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
-Xlinker --add-needed \
-Xlinker --no-as-needed \
$(FOAM_EXTRA_LDFLAGS)
-Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) \
-Xlinker --add-needed \
-Xlinker --no-as-needed \
$(FOAM_EXTRA_LDFLAGS)
-Xlinker --no-as-needed
#------------------------------------------------------------------------------

4
wmake/rules/General/Nvidia/link-c
View File

@ -1,5 +1,9 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) $(cARCH) -shared
LINKEXE = $(cc) $(cARCH) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
#------------------------------------------------------------------------------

10
wmake/rules/General/Nvidia/link-c++
View File

@ -1,8 +1,10 @@
#------------------------------------------------------------------------------
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared \
$(FOAM_EXTRA_LDFLAGS)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) \
-Xlinker --add-needed \
$(FOAM_EXTRA_LDFLAGS)
-Xlinker --add-needed
#------------------------------------------------------------------------------

2
wmake/rules/General/cuda
View File

@ -3,7 +3,7 @@
SUFFIXES += .cu
ifeq (,$(NVARCH))
ifeq (,$(strip $(NVARCH)))
NVARCH = 70
endif

8
wmake/rules/General/general
View File

@ -33,7 +33,7 @@ else
endif
# Default compilation is 'Opt' - never permit an empty value
ifeq (,$(WM_COMPILE_OPTION))
ifeq (,$(strip $(WM_COMPILE_OPTION)))
WM_COMPILE_OPTION := Opt
endif
@ -46,6 +46,12 @@ ifneq ("$(COMPILER_FAMILY)","$(WM_COMPILER)")
sinclude $(RULES)/general
sinclude $(RULES)/c++
endif
# Add compile flags for openmp
ifneq (,$(findstring +openmp,$(WM_COMPILE_CONTROL)))
c++FLAGS += $(COMP_OPENMP)
endif
include $(GENERAL_RULES)/transform
#------------------------------------------------------------------------------

4
wmake/rules/General/mpi-rules
View File

@ -22,7 +22,7 @@ ifneq ("$(MPLIB_FAMILY)","$(WM_MPLIB)")
endif
# Specific rules
ifneq ("","$(WM_MPLIB)")
ifneq (,$(strip $(WM_MPLIB)))
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
# system-specific
@ -32,7 +32,7 @@ ifneq ("","$(WM_MPLIB)")
endif
# Default target MPI libdir is PROJECT lib/<mpi-name>
ifeq (,$(FOAM_MPI_LIBBIN))
ifeq (,$(strip $(FOAM_MPI_LIBBIN)))
FOAM_MPI_LIBBIN := $(FOAM_LIBBIN)/$(FOAM_MPI)
endif

4
wmake/rules/General/transform
View File

@ -11,7 +11,7 @@ WMKDEP := $(WMAKE_BIN)/wmkdepend
WMKDEP_FLAGS := -eWM_PROJECT_DIR -eWM_THIRD_PARTY_DIR
ifneq ("","$(WM_QUIET)")
ifneq (,$(strip $(WM_QUIET)))
E=@
define QUIET_MESSAGE
@echo " $1: $2";
@ -38,7 +38,7 @@ $(foreach s,$(SUFFIXES),$(eval $(call DEFINE_TRANSFORM,$(s))))
$(OBJECTS_DIR)/%.dep : %
$(call QUIET_MESSAGE,dep,$(<F))
$(call VERBOSE_MESSAGE,Making dependency list for source file,$(<F))
$(call VERBOSE_MESSAGE,Making dependencies:,$(<F))
@$(WM_SCRIPTS)/makeTargetDir $@
@$(WMKDEP) $(WMKDEP_FLAGS) -o$@ -I$(*D) $(LIB_HEADER_DIRS) $<

2
wmake/rules/darwin64Clang/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Clang/c
cARCH := -m64 -ftrapping-math
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/darwin64Clang/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Clang/c++
c++ARCH := -m64 -pthread -ftrapping-math
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Amd/c
View File

@ -5,7 +5,7 @@ include $(GENERAL_RULES)/Clang/c
cARCH := -m64
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Amd/c++
View File

@ -4,7 +4,7 @@ include $(GENERAL_RULES)/Clang/c++
c++ARCH := -m64 -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Clang/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Clang/c
cARCH := -m64
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Clang/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Clang/c++
c++ARCH := -m64 -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Cray/c
View File

@ -6,7 +6,7 @@ include $(GENERAL_RULES)/Gcc/c
cc := cc
cARCH := -m64
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Cray/c++
View File

@ -6,7 +6,7 @@ include $(GENERAL_RULES)/Gcc/c++
CC := CC -std=c++14
c++ARCH := -m64 -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Gcc/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c
cARCH := -m64
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Gcc/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c++
c++ARCH := -m64 -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Icc/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Icc/c
cARCH :=
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Icc/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Icc/c++
c++ARCH := -pthread -fp-trap=common -fp-model precise
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Icx/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Icx/c
cARCH :=
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Icx/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Icx/c++
c++ARCH := -fp-model precise
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Mingw/c
View File

@ -6,7 +6,7 @@ include $(GENERAL_RULES)/Gcc/c
cc := x86_64-w64-mingw32-gcc
cARCH := -m64
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

8
wmake/rules/linux64Mingw/c++
View File

@ -7,7 +7,7 @@ include $(GENERAL_RULES)/Gcc/c++
CC := x86_64-w64-mingw32-g++ -std=gnu++14
c++ARCH := -m64 -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif
@ -32,13 +32,11 @@ LINKLIBSO = $(CC) $(c++FLAGS) -shared \
-Wl,--enable-runtime-pseudo-reloc \
-Wl,--enable-auto-import \
-Wl,--enable-auto-image-base \
-Wl,--strip-all \
$(FOAM_EXTRA_LDFLAGS)
-Wl,--strip-all
LINKEXE = $(CC) $(c++FLAGS) \
-Wl,--enable-auto-import \
-Wl,--strip-all \
-Wl,--force-exe-suffix \
$(FOAM_EXTRA_LDFLAGS)
-Wl,--force-exe-suffix
#------------------------------------------------------------------------------

2
wmake/rules/linux64Nvidia/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Nvidia/c
cARCH := -m64
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linux64Nvidia/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Nvidia/c++
c++ARCH := -m64
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxARM64Arm/c
View File

@ -6,7 +6,7 @@ include $(GENERAL_RULES)/Clang/c
cc := armclang$(COMPILER_VERSION)
cARCH := -mcpu=native
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxARM64Arm/c++
View File

@ -6,7 +6,7 @@ include $(GENERAL_RULES)/Clang/c++
CC := armclang++$(COMPILER_VERSION) -std=c++14
c++ARCH := -mcpu=native -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxARM64Clang/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Clang/c
cARCH :=
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxARM64Clang/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Clang/c++
c++ARCH := -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxARM64Fujitsu/c
View File

@ -6,7 +6,7 @@ include $(GENERAL_RULES)/Clang/c
cc := fcc$(COMPILER_VERSION)
cARCH :=
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxARM64Fujitsu/c++
View File

@ -6,7 +6,7 @@ include $(GENERAL_RULES)/Clang/c++
CC := FCC$(COMPILER_VERSION) -std=c++14
c++ARCH := -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxARM64Gcc/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c
cARCH :=
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxARM64Gcc/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c++
c++ARCH := -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxARM64Nvidia/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Nvidia/c
cARCH :=
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxARM64Nvidia/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Nvidia/c++
c++ARCH :=
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxClang/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Clang/c
cARCH := -m32
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxClang/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Clang/c++
c++ARCH := -m32 -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxGcc/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c
cARCH := -m32
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxGcc/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c++
c++ARCH := -m32 -pthread
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxIcc/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Icc/c
cARCH := -gcc-version=400
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxIcc/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Icc/c++
c++ARCH := -pthread -fp-trap=common -fp-model precise
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxPPC64Gcc/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c
cARCH := -m64 -mcpu=power5+
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxPPC64Gcc/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c++
c++ARCH := -m64 -mcpu=power5+
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxPPC64leGcc/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c
cARCH := -m64 -mcpu=power8
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/linuxPPC64leGcc/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c++
c++ARCH := -m64 -mcpu=power8
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif

2
wmake/rules/solaris64Gcc/c
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c
cARCH := -m64
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
endif

2
wmake/rules/solaris64Gcc/c++
View File

@ -3,7 +3,7 @@ include $(GENERAL_RULES)/Gcc/c++
c++ARCH := -m64
ifneq (,$(WM_COMPILE_OPTION))
ifneq (,$(strip $(WM_COMPILE_OPTION)))
sinclude $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
endif