| 106 |
|
} |
| 107 |
|
elsif ($hasicc) |
| 108 |
|
{ |
| 109 |
< |
print OUTFILE "JSOC_AUTOCOMPILER = icc\n"; |
| 109 |
> |
print OUTFILE "COMPILER = icc\n"; |
| 110 |
|
} |
| 111 |
|
else |
| 112 |
|
{ |
| 113 |
< |
print OUTFILE "JSOC_AUTOCOMPILER = gcc\n"; |
| 113 |
> |
print OUTFILE "COMPILER = gcc\n"; |
| 114 |
|
} |
| 115 |
|
|
| 116 |
|
if (!$hasifort && !$hasgfort) |
| 119 |
|
} |
| 120 |
|
elsif ($hasifort) |
| 121 |
|
{ |
| 122 |
< |
print OUTFILE "JSOC_AUTOFCOMPILER = ifort\n"; |
| 122 |
> |
print OUTFILE "FCOMPILER = ifort\n"; |
| 123 |
|
} |
| 124 |
|
else |
| 125 |
|
{ |
| 126 |
< |
print OUTFILE "JSOC_AUTOFCOMPILER = gfortran\n"; |
| 126 |
> |
print OUTFILE "FCOMPILER = gfortran\n"; |
| 127 |
|
} |
| 128 |
|
|
| 129 |
+ |
# Print out env var override logic - otherwise we lose this logic in make_basic.mk |
| 130 |
+ |
# as the include of custom.mk comes after this logic in make_basic.mk |
| 131 |
+ |
print OUTFILE "ifneq (\$(JSOC_COMPILER),)\n COMPILER = \$(JSOC_COMPILER)\nendif\n"; |
| 132 |
+ |
print OUTFILE "ifneq (\$(JSOC_FCOMPILER),)\n FCOMPILER = \$(JSOC_FCOMPILER)\nendif\n\n"; |
| 133 |
+ |
|
| 134 |
|
# Set DEFAULT values for Stanford-specific (if running at Stanford) make variables. |
| 135 |
|
if (-e "suflag.txt") |
| 136 |
|
{ |
