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

Diff for /JSOC/make_basic.mk between version 1.49 and 1.50

version 1.49, 2009/07/27 23:50:08 version 1.50, 2009/07/31 23:09:32
Line 216  F_LF_ALL = -nofor_main -no-ipo
Line 216  F_LF_ALL = -nofor_main -no-ipo
 GCC_CF_GCCCOMP  = -DGCCCOMP GCC_CF_GCCCOMP  = -DGCCCOMP
 ICC_CF_ICCCOMP  = -DICCCOMP ICC_CF_ICCCOMP  = -DICCCOMP
  
   CCFLAGS_OPT     :=
   
   ifeq ($(COMPILER), icc)
     ifeq ($(JSOC_MACHINE), linux_x86_64)
       CCFLAGS_OPT := -xW
     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)   GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)
 # -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 -xW $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)    ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(CCFLAGS_OPT) $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)
  
   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)     GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)


Legend:
Removed from v.1.49  
changed lines
  Added in v.1.50

Karen Tian
Powered by
ViewCVS 0.9.4