|
version 1.9, 2009/10/14 17:07:41
|
version 1.10, 2010/08/29 04:43:24
|
| Line 106 if (defined($outfile)) |
|
| Line 106 if (defined($outfile)) |
|
| } | } |
| elsif ($hasicc) | elsif ($hasicc) |
| { | { |
| print OUTFILE "JSOC_AUTOCOMPILER = icc\n"; |
print OUTFILE "COMPILER = icc\n"; |
| } | } |
| else | else |
| { | { |
| print OUTFILE "JSOC_AUTOCOMPILER = gcc\n"; |
print OUTFILE "COMPILER = gcc\n"; |
| } | } |
| | |
| if (!$hasifort && !$hasgfort) | if (!$hasifort && !$hasgfort) |
| Line 119 if (defined($outfile)) |
|
| Line 119 if (defined($outfile)) |
|
| } | } |
| elsif ($hasifort) | elsif ($hasifort) |
| { | { |
| print OUTFILE "JSOC_AUTOFCOMPILER = ifort\n"; |
print OUTFILE "FCOMPILER = ifort\n"; |
| } | } |
| else | else |
| { | { |
| print OUTFILE "JSOC_AUTOFCOMPILER = gfortran\n"; |
print OUTFILE "FCOMPILER = gfortran\n"; |
| } | } |
| | |
| |
# Print out env var override logic - otherwise we lose this logic in make_basic.mk |
| |
# as the include of custom.mk comes after this logic in make_basic.mk |
| |
print OUTFILE "ifneq (\$(JSOC_COMPILER),)\n COMPILER = \$(JSOC_COMPILER)\nendif\n"; |
| |
print OUTFILE "ifneq (\$(JSOC_FCOMPILER),)\n FCOMPILER = \$(JSOC_FCOMPILER)\nendif\n\n"; |
| |
|
| # Set DEFAULT values for Stanford-specific (if running at Stanford) make variables. | # Set DEFAULT values for Stanford-specific (if running at Stanford) make variables. |
| if (-e "suflag.txt") | if (-e "suflag.txt") |
| { | { |
Return to
moreconfigure.pl
CVS log
Up to [Development] / JSOC / Attic