ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/JSOC/make_basic.mk
(Generate patch)

Comparing make_basic.mk (file contents):
Revision 1.60 by kehcheng, Tue Oct 6 20:13:24 2009 UTC vs.
Revision 1.61 by arta, Tue Oct 13 19:22:37 2009 UTC

# Line 196 | Line 196 | F_LF_ALL       = -nofor_main  -openmp -static-
196   GCC_CF_GCCCOMP  = -DGCCCOMP
197   ICC_CF_ICCCOMP  = -DICCCOMP -openmp
198  
199 CCFLAGS_OPT     :=
200
201 ifeq ($(COMPILER), icc)
202  ifeq ($(JSOC_MACHINE), linux_x86_64)
203    CCFLAGS_OPT :=
204  endif
205 endif
206
199   # can't figure out how to get stupid make to do if/else if/else
200   ifeq ($(DEBUG), 0)
201    GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)
202   # -xW tells the icc compiler to optimize for Pentium 4
203 <  ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(CCFLAGS_OPT) $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW)
203 >  ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW)
204  
205    ifeq ($(JSOC_MACHINE), linux_x86_64)
206      GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)
# Line 237 | Line 229 | endif
229  
230   # Other compiler-specific Fortran COMPILE flags
231   ifeq ($(FCOMPILER), ifort)
240  ifeq ($(JSOC_MACHINE), linux_x86_64)
241    FCFLAGS_OPT :=
242  endif
232    FCFLAGS_INIT := -ftrapuv
233   else
234    # must be gfortran
246  FCFLAGS_OPT   :=
235    FCFLAGS_INIT  :=
236   endif
237  
238   ifeq ($(DEBUG), 0)
239   # -xW optimizes ifort compilation for Pentium 4
240   # -ftrapuv initializes stack local variables to an unusual value to aid error detection.
241 <  F_CF_ALL      := $(F_CF_ALL) $(FCFLAGS_OPT) $(FCOMPILER_WARN)
241 >  F_CF_ALL      := $(F_CF_ALL) $(FCOMPILER_WARN)
242   else
243    F_CF_ALL      := $(F_CF_ALL) -g $(FCFLAGS_INIT) $(FCOMPILER_WARN)
244   endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines