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

CONFIG: relax requirement on C compile option

Browse Source 
- with 1906, OpenFOAM is purely C++ code and the last toolchain bits C
  code have been avoided. Thus relax the wmake C rule for including
  WM_COMPILE_OPTION. This makes it much easier to add different
  compiler options with fewer files.

  For example, for Broadwell-specific options:

      cd wmake/rules/linux64Gcc
      cp c++Opt c++OptBdw

      edit this file and then use WM_COMPILE_OPTION=OptBdw

- ensure that WM_COMPILE_OPTION is always non-empty
This commit is contained in:
Mark Olesen
2019-08-07 09:22:09 +02:00
committed by Andrew Heather
parent 0395fa2122
commit d4a0dc631c
21 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/config.csh/settings
View File

@ -20,7 +20,7 @@
#
#------------------------------------------------------------------------------
setenv WM_ARCH `uname -s` # System name
## if (! $?WM_OSTYPE ) setenv WM_OSTYPE POSIX # System type (POSIX is default)
if (! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt # Default: Optimize
set archOption=64
if ($?WM_ARCH_OPTION) then

2
etc/config.sh/settings
View File

@ -20,7 +20,7 @@
#
#------------------------------------------------------------------------------
export WM_ARCH="$(uname -s)" # System name
## : ${WM_OSTYPE:=POSIX}; export WM_OSTYPE # System type (POSIX is default)
: ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION # Default: Optimize
archOption="${WM_ARCH_OPTION:-64}"
unset WM_ARCH_OPTION # Compiling 32-bit on 64-bit system

3
wmake/rules/darwin64Clang/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Clang/c
cARCH = -m64 -ftrapping-math
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linux64Clang/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Clang/c
cARCH = -m64
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linux64Cray/c
View File

@ -6,7 +6,8 @@ cARCH = -m64
cWARN = -Wall
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linux64Gcc/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Gcc/c
cARCH = -m64
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linux64Icc/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Icc/c
cARCH =
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linux64Mingw/c
View File

@ -4,7 +4,8 @@ cARCH = -m64
cc = x86_64-w64-mingw32-gcc
include $(RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS)

3
wmake/rules/linux64Pgi/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Pgi/c
cARCH = -m64
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linuxARM64Arm/c
View File

@ -5,7 +5,8 @@ cc = armclang
cARCH = -mcpu=native
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linuxARM64Clang/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Clang/c
cARCH =
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linuxARM64Gcc/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Gcc/c
cARCH =
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

7
wmake/rules/linuxARM7Gcc/c
View File

@ -1,10 +1,9 @@
SUFFIXES += .c
include $(GENERAL_RULES)/Gcc/c
cARCH = -mcpu=cortex-a9
cWARN = -Wall
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linuxClang/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Clang/c
cARCH = -m32
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linuxGcc/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Gcc/c
cARCH = -m32
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linuxIA64Gcc/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Gcc/c
cARCH =
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linuxIA64Icc/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Icc/c
cARCH =
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linuxIcc/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Icc/c
cARCH = -gcc-version=400
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linuxPPC64Gcc/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Gcc/c
cARCH = -m64 -mcpu=power5+
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/linuxPPC64leGcc/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Gcc/c
cARCH = -m64 -mcpu=power8
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC

3
wmake/rules/solaris64Gcc/c
View File

@ -2,7 +2,8 @@ include $(GENERAL_RULES)/Gcc/c
cARCH = -m64
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC