|
version 1.60, 2009/10/06 20:13:24
|
version 1.61, 2009/10/13 19:22:37
|
| Line 196 F_LF_ALL = -nofor_main -openmp -static- |
|
| Line 196 F_LF_ALL = -nofor_main -openmp -static- |
|
| GCC_CF_GCCCOMP = -DGCCCOMP | GCC_CF_GCCCOMP = -DGCCCOMP |
| ICC_CF_ICCCOMP = -DICCCOMP -openmp | ICC_CF_ICCCOMP = -DICCCOMP -openmp |
| | |
| CCFLAGS_OPT := |
|
| |
|
| ifeq ($(COMPILER), icc) |
|
| ifeq ($(JSOC_MACHINE), linux_x86_64) |
|
| CCFLAGS_OPT := |
|
| endif |
|
| endif |
|
| |
|
| # can't figure out how to get stupid make to do if/else if/else | # can't figure out how to get stupid make to do if/else if/else |
| ifeq ($(DEBUG), 0) | ifeq ($(DEBUG), 0) |
| GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) | GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) |
| # -xW tells the icc compiler to optimize for Pentium 4 | # -xW tells the icc compiler to optimize for Pentium 4 |
| ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(CCFLAGS_OPT) $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) |
ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) |
| | |
| ifeq ($(JSOC_MACHINE), linux_x86_64) | ifeq ($(JSOC_MACHINE), linux_x86_64) |
| GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) | GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) |
|
|
|
| | |
| # Other compiler-specific Fortran COMPILE flags | # Other compiler-specific Fortran COMPILE flags |
| ifeq ($(FCOMPILER), ifort) | ifeq ($(FCOMPILER), ifort) |
| ifeq ($(JSOC_MACHINE), linux_x86_64) |
|
| FCFLAGS_OPT := |
|
| endif |
|
| FCFLAGS_INIT := -ftrapuv | FCFLAGS_INIT := -ftrapuv |
| else | else |
| # must be gfortran | # must be gfortran |
| FCFLAGS_OPT := |
|
| FCFLAGS_INIT := | FCFLAGS_INIT := |
| endif | endif |
| | |
| ifeq ($(DEBUG), 0) | ifeq ($(DEBUG), 0) |
| # -xW optimizes ifort compilation for Pentium 4 | # -xW optimizes ifort compilation for Pentium 4 |
| # -ftrapuv initializes stack local variables to an unusual value to aid error detection. | # -ftrapuv initializes stack local variables to an unusual value to aid error detection. |
| F_CF_ALL := $(F_CF_ALL) $(FCFLAGS_OPT) $(FCOMPILER_WARN) |
F_CF_ALL := $(F_CF_ALL) $(FCOMPILER_WARN) |
| else | else |
| F_CF_ALL := $(F_CF_ALL) -g $(FCFLAGS_INIT) $(FCOMPILER_WARN) | F_CF_ALL := $(F_CF_ALL) -g $(FCFLAGS_INIT) $(FCOMPILER_WARN) |
| endif | endif |
Return to
make_basic.mk
CVS log
Up to [Development] / JSOC