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

Diff for /JSOC/make_basic.mk between version 1.86 and 1.89

version 1.86, 2017/02/15 22:17:28 version 1.89, 2017/08/16 19:15:49
Line 107  endif
Line 107  endif
  
 # PostgreSQL # PostgreSQL
 PGH = -I$(POSTGRES_INCS) PGH = -I$(POSTGRES_INCS)
   
   # For use of dynamic library
 PGL = -L$(POSTGRES_LIBS) PGL = -L$(POSTGRES_LIBS)
 PGLIBNAME = $(POSTGRES_LIB)  PGLIBS = $(POSTGRES_LIBS)/lib$(POSTGRES_LIB).so
 PGLIBS = $(PGL) -l$(PGLIBNAME)  
  
 # CFITSIO # CFITSIO
 CFITSIOH = -I$(CFITSIO_INCS) CFITSIOH = -I$(CFITSIO_INCS)
Line 220  endif
Line 221  endif
 # Link flags for all targets # Link flags for all targets
 # #
 LL_ALL          = $(SYSLIBS) -lcurl LL_ALL          = $(SYSLIBS) -lcurl
   
   
   ifeq ($(JSOC_MACHINE), linux_avx)
   GCC_LF_ALL      = $(STATIC) -Wl,--copy-dt-needed-entries
   ICC_LF_ALL      = -diag-disable 10237 $(STATIC) -openmp -static-intel -Wl,-export-dynamic -Wl,--copy-dt-needed-entries
   else
 GCC_LF_ALL      = $(STATIC) GCC_LF_ALL      = $(STATIC)
 ICC_LF_ALL      = -diag-disable 10237 $(STATIC) -openmp -static-intel -Wl,-export-dynamic ICC_LF_ALL      = -diag-disable 10237 $(STATIC) -openmp -static-intel -Wl,-export-dynamic
   endif
  
 # Fortran global LINK flags # Fortran global LINK flags
 ifeq ($(FCOMPILER), ifort) ifeq ($(FCOMPILER), ifort)


Legend:
Removed from v.1.86  
changed lines
  Added in v.1.89

Karen Tian
Powered by
ViewCVS 0.9.4