Commit d4a0dc63 authored by Mark OLESEN's avatar Mark OLESEN Committed by Andrew Heather
Browse files

CONFIG: relax requirement on C compile option

- 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
parent 0395fa21
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment