songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CONFIG: adjust settings for solaris and darwin

Browse Source 
solaris:
  - rename WM_ARCH from SunOS to solaris64 for consistency with wmake/rules
  - drop non-64 solaris from wmake/rules
  - remove automatic selection of FJMPI. This should be done in the bashrc
    or prefs.sh file instead.
  - remove old (likely inaccurate) exported flags, rely on wmake -show-xyz
    or user config instead

darwin:
  - remove '-Ddarwin' from the exported WM_CFLAGS, WM_CXXFLAGS.
    Not used elsewhere (ThirdParty)
This commit is contained in:
Mark Olesen 2019-04-12 11:06:45 +02:00 committed by Andrew Heather
parent 0a23ad3944
commit 09cf9d9963
15 changed files with 10 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/config.csh/settings
View File

@ -108,8 +108,8 @@ case Linux:
case Darwin: # Presumably x86_64
if (! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64 # Default to 64-bit
setenv WM_ARCH darwin64
setenv WM_CFLAGS "$WM_CFLAGS -m64 -Ddarwin"
setenv WM_CXXFLAGS "$WM_CXXFLAGS -m64 -Ddarwin"
setenv WM_CFLAGS "$WM_CFLAGS -m64"
setenv WM_CXXFLAGS "$WM_CXXFLAGS -m64"
/bin/cat << INCOMPLETE
===============================================================================
Darwin support (clang only) is incomplete or untested in this OpenFOAM release.
@ -118,13 +118,9 @@ For further assistance, please contact www.OpenFOAM.com
INCOMPLETE
breaksw
case SunOS:
setenv WM_ARCH SunOS64
setenv WM_MPLIB FJMPI
case SunOS*:
setenv WM_ARCH solaris64
setenv WM_COMPILER_LIB_ARCH 64
setenv WM_CFLAGS "$WM_CFLAGS -mabi=64"
setenv WM_CXXFLAGS "$WM_CXXFLAGS -mabi=64"
setenv WM_LDFLAGS "-mabi=64 -G0"
breaksw
default:

4
etc/config.sh/example/compiler
View File

@ -34,8 +34,8 @@ Gcc70)
Gcc48u)
# Example of using the system GCC 4.8 in Ubuntu 15.10. Keep in mind you
# will also need to create the respective directory in "wmake/rules"
export WM_CC='gcc-4.8'
export WM_CXX='g++-4.8'
export CC='gcc-4.8'
export CXX='g++-4.8'
;;
esac

12
etc/config.sh/settings
View File

@ -102,8 +102,8 @@ Linux)
Darwin) # Presumably x86_64
: ${WM_ARCH_OPTION:=64}; export WM_ARCH_OPTION # Default to 64-bit
WM_ARCH=darwin64
export WM_CFLAGS="$WM_CFLAGS -m64 -Ddarwin"
export WM_CXXFLAGS="$WM_CXXFLAGS -m64 -Ddarwin"
export WM_CFLAGS="$WM_CFLAGS -m64"
export WM_CXXFLAGS="$WM_CXXFLAGS -m64"
/bin/cat << INCOMPLETE 1>&2
===============================================================================
Darwin support (clang only) is incomplete or untested in this OpenFOAM release.
@ -112,13 +112,9 @@ For further assistance, please contact www.OpenFOAM.com
INCOMPLETE
;;
SunOS)
WM_ARCH=SunOS64
WM_MPLIB=FJMPI
SunOS*)
WM_ARCH=solaris64
export WM_COMPILER_LIB_ARCH=64
export WM_CFLAGS="$WM_CFLAGS -mabi=64"
export WM_CXXFLAGS="$WM_CXXFLAGS -mabi=64"
export WM_LDFLAGS="-mabi=64 -G0"
;;
*) # An unsupported operating system

3
wmake/rules/solarisGcc/X
View File

@ -1,3 +0,0 @@
XFLAGS =
XINC = $(XFLAGS) -I/usr/openwin/include/X11
XLIBS = -L/usr/openwin/lib -lXext -lX11

14
wmake/rules/solarisGcc/c
View File

@ -1,14 +0,0 @@
include $(GENERAL_RULES)/Gcc/c
cc = gcc
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) -shared
LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

17
wmake/rules/solarisGcc/c++
View File

@ -1,17 +0,0 @@
include $(GENERAL_RULES)/Gcc/c++
CC = g++ -std=c++11
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed

2
wmake/rules/solarisGcc/c++Debug
View File

@ -1,2 +0,0 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline -finline-functions

4
wmake/rules/solarisGcc/c++Opt
View File

@ -1,4 +0,0 @@
c++DBUG =
c++OPT = -O3 -fno-schedule-insns
ROUNDING_MATH = -frounding-math

2
wmake/rules/solarisGcc/c++Prof
View File

@ -1,2 +0,0 @@
c++DBUG = -pg
c++OPT = -O2 -fno-schedule-insns

2
wmake/rules/solarisGcc/cDebug
View File

@ -1,2 +0,0 @@
cDBUG = -ggdb -DFULLDEBUG
cOPT = -O1 -fdefault-inline -finline-functions

2
wmake/rules/solarisGcc/cOpt
View File

@ -1,2 +0,0 @@
cDBUG =
cOPT = -O2 -fno-schedule-insns

2
wmake/rules/solarisGcc/cProf
View File

@ -1,2 +0,0 @@
cDBUG = -pg
cOPT = -O2 -fno-schedule-insns

9
wmake/rules/solarisGcc/general
View File

@ -1,9 +0,0 @@
CPP = /usr/lib/cpp -undef
PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
include $(GENERAL_RULES)/standard
include $(DEFAULT_RULES)/X
include $(DEFAULT_RULES)/c
include $(DEFAULT_RULES)/c++

3
wmake/rules/solarisGcc/mplibMPI
View File

@ -1,3 +0,0 @@
PFLAGS =
PINC = -isystem $(MPI_ROOT)/include
PLIBS = -L$(MPI_ROOT)/lib/$(MPI_ARCH) -lmpi

3
wmake/rules/solarisGcc/mplibMPICH
View File

@ -1,3 +0,0 @@
PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -isystem $(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio