ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/JSOC/localize.py

Comparing localize.py (file contents):
Revision 1.6 by arta, Wed Nov 13 17:26:27 2013 UTC vs.
Revision 1.7 by arta, Wed Nov 13 18:10:29 2013 UTC

#	Line 509 | Line 509 | def parseConfig(fin, keymap, addenda, de
509		if not rv:
510		for mach in machDict:
511		mDefsMake.extend(list('\nifeq ($(MACHTYPE), ' + mach + ')'))
512	<	for var in platDict[plat]:
513	<	mDefsMake.extend(list('\n' + var + ' = ' + platDict[plat][var]))
512	>	for var in machDict[mach]:
513	>	mDefsMake.extend(list('\n' + var + ' = ' + machDict[mach][var]))
514		mDefsMake.extend(list('\nendif\n'))
515
516		return rv
#	Line 651 | Line 651 | def configureComps(defs, mDefs):
651		mDefs.extend(list('\nFCOMPILER = gfortran'))
652
653		# Environment overrides. These get written, regardless of the disposition of auto-configuration.
654	<	mDefs.extend(list('\nifneq $(JSOC_COMPILER,)\n  COMPILER = $(JSOC_COMPILER)\nendif'))
655	<	mDefs.extend(list('\nifneq $(JSOC_FCOMPILER,)\n  FCOMPILER = $(JSOC_FCOMPILER)\nendif'))
654	>	mDefs.extend(list('\nifneq ($(JSOC_COMPILER,))\n  COMPILER = $(JSOC_COMPILER)\nendif'))
655	>	mDefs.extend(list('\nifneq ($(JSOC_FCOMPILER,))\n  FCOMPILER = $(JSOC_FCOMPILER)\nendif'))
656
657		return rv
658

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines