(file) Return to make_basic.mk CVS log (file) (dir) Up to [Development] / JSOC

Diff for /JSOC/make_basic.mk between version 1.59 and 1.60

version 1.59, 2009/09/28 21:09:28 version 1.60, 2009/10/06 20:13:24
Line 183  endif
Line 183  endif
 # #
 LL_ALL          = $(SYSLIBS) LL_ALL          = $(SYSLIBS)
 GCC_LF_ALL      = $(STATIC) GCC_LF_ALL      = $(STATIC)
 ICC_LF_ALL      = $(STATIC)  ICC_LF_ALL      = $(STATIC) -openmp -static-intel
  
 # Fortran global LINK flags # Fortran global LINK flags
 F_LF_ALL        = -nofor_main -no-ipo  F_LF_ALL        = -nofor_main  -openmp -static-intel
 #***********************************************************************************************# #***********************************************************************************************#
  
 #***********************************************************************************************# #***********************************************************************************************#
Line 194  F_LF_ALL = -nofor_main -no-ipo
Line 194  F_LF_ALL = -nofor_main -no-ipo
 # GLOBAL COMPILE FLAGS # GLOBAL COMPILE FLAGS
 # #
 GCC_CF_GCCCOMP  = -DGCCCOMP GCC_CF_GCCCOMP  = -DGCCCOMP
 ICC_CF_ICCCOMP  = -DICCCOMP  ICC_CF_ICCCOMP  = -DICCCOMP -openmp
  
 CCFLAGS_OPT     := CCFLAGS_OPT     :=
  
 ifeq ($(COMPILER), icc) ifeq ($(COMPILER), icc)
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
     CCFLAGS_OPT := -xW      CCFLAGS_OPT :=
   endif   endif
 endif endif
  
Line 231  endif
Line 231  endif
 # Fortran global COMPILE flags # Fortran global COMPILE flags
 ifeq ($(JSOC_MACHINE), linux_x86_64) ifeq ($(JSOC_MACHINE), linux_x86_64)
   ifeq ($(FCOMPILER), ifort)   ifeq ($(FCOMPILER), ifort)
     F_CF_ALL := -mcmodel=medium      F_CF_ALL := -openmp
   endif   endif
 endif endif
  
 # Other compiler-specific Fortran COMPILE flags # Other compiler-specific Fortran COMPILE flags
 ifeq ($(FCOMPILER), ifort) ifeq ($(FCOMPILER), ifort)
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
     FCFLAGS_OPT := -xW      FCFLAGS_OPT :=
   endif   endif
   FCFLAGS_INIT := -ftrapuv   FCFLAGS_INIT := -ftrapuv
 else else


Legend:
Removed from v.1.59  
changed lines
  Added in v.1.60

Karen Tian
Powered by
ViewCVS 0.9.4