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

Diff for /JSOC/make_basic.mk between version 1.40 and 1.41

version 1.40, 2009/04/10 20:19:49 version 1.41, 2009/04/10 22:29:02
Line 8  DBNAME = POSTGRESQL
Line 8  DBNAME = POSTGRESQL
 PGIPATH = /usr/include/pgsql PGIPATH = /usr/include/pgsql
  
 COMPILER = icc COMPILER = icc
   F77 = ifort
   
 ifeq ($(JSOC_MACHINE), mac_osx_ppc) ifeq ($(JSOC_MACHINE), mac_osx_ppc)
 COMPILER = gcc COMPILER = gcc
   F77 = f77
 endif endif
 ifeq ($(JSOC_MACHINE), mac_osx_ia32) ifeq ($(JSOC_MACHINE), mac_osx_ia32)
 COMPILER = gcc COMPILER = gcc
   F77 = f77
 endif endif
  
 # Check for debug vs. release build - release is default. # Check for debug vs. release build - release is default.
Line 48  endif
Line 52  endif
  
 _JSOCROOT_ = .. _JSOCROOT_ = ..
  
 ifeq ($(JSOC_MACHINE), mac_osx)  
 F77 = f77  
 else  
 F77 = ifort  
 endif  
   
 # if fortran compiler # if fortran compiler
 D_GCC_FORT = D_GCC_FORT =
 ifeq ($(F77), ifort) ifeq ($(F77), ifort)
Line 61  ifeq ($(F77), ifort)
Line 59  ifeq ($(F77), ifort)
 endif endif
  
 ifeq ($(JSOC_MACHINE), linux_x86_64) ifeq ($(JSOC_MACHINE), linux_x86_64)
     ifeq ($(F77), ifort)
   F77 = ifort -mcmodel=medium   F77 = ifort -mcmodel=medium
 endif endif
   endif
  
 #***********************************************************************************************# #***********************************************************************************************#
 # #


Legend:
Removed from v.1.40  
changed lines
  Added in v.1.41

Karen Tian
Powered by
ViewCVS 0.9.4