CONFIG: adjust settings for solaris and darwin

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

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