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.46 by arta, Fri Jun 5 21:03:51 2009 UTC vs.
Revision 1.47 by arta, Fri Jul 24 14:13:48 2009 UTC

# Line 16 | Line 16 | _JSOCROOT_ = ..
16   COMPILER = icc
17   FCOMPILER = ifort
18  
19 < ifneq ($(AUTOCOMPILER),)
20 < COMPILER = $(AUTOCOMPILER)
19 > ifneq ($(JSOC_AUTOCOMPILER),)
20 > COMPILER = $(JSOC_AUTOCOMPILER)
21   endif
22  
23 < ifneq ($(AUTOFCOMPILER),)
24 < FCOMPILER = $(AUTOFCOMPILER)
23 > ifneq ($(JSOC_AUTOFCOMPILER),)
24 > FCOMPILER = $(JSOC_AUTOFCOMPILER)
25   endif
26  
27   # can set through custom.mk or through environment
28 < ifneq ($(CUSTOM_COMPILER),)
29 < COMPILER = $(CUSTOM_COMPILER)
28 > ifneq ($(JSOC_COMPILER),)
29 > COMPILER = $(JSOC_COMPILER)
30   endif
31  
32 < ifneq ($(CUSTOM_FCOMPILER),)
33 < FCOMPILER = $(CUSTOM_FCOMPILER)
32 > ifneq ($(JSOC_FCOMPILER),)
33 > FCOMPILER = $(JSOC_FCOMPILER)
34   endif
35   #***********************************************************************************************#
36  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines