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

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

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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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++

View File

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

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