Skip to content

Commit e51d808

Browse files
authored
Merge pull request #2548 from jedwards4b/configure_clean_location
clean should not look for mpilibs configure --clean shouldn't need to figure out what mpi library it needs. Test suite: by hand configure --clean on cheyenne Test baseline: Test namelist changes: Test status: [bit for bit, roundoff, climate changing] Fixes #2542 User interface changes?: Update gh-pages html (Y/N)?: Code review:mnlevy1981
2 parents 1626fe0 + 2fe2a8a commit e51d808

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

tools/configure

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,19 @@ def parse_command_line(args):
108108
% compiler)
109109
opts['compiler'] = compiler
110110
opts['os'] = machobj.get_value('OS')
111+
112+
if args.clean:
113+
files = ["Macros.make", "Macros.cmake", "env_mach_specific.xml", ".env_mach_specific.sh",
114+
".env_mach_specific.csh", "Depends.%s"%compiler, "Depends.%s"%args.machine,
115+
"Depends.%s.%s"%(args.machine,compiler)]
116+
for file_ in files:
117+
if os.path.isfile(file_):
118+
logger.warn("Removing file %s"%file_)
119+
os.remove(file_)
120+
if argcnt == 2:
121+
opts['clean_only'] = True
122+
return opts
123+
111124
# Set MPI library.
112125
if args.mpilib is not None:
113126
mpilib = args.mpilib
@@ -134,17 +147,6 @@ def parse_command_line(args):
134147
opts['debug'] = debug
135148

136149

137-
if args.clean:
138-
files = ["Macros.make", "Macros.cmake", "env_mach_specific.xml", ".env_mach_specific.sh",
139-
".env_mach_specific.csh", "Depends.%s"%compiler, "Depends.%s"%args.machine,
140-
"Depends.%s.%s"%(args.machine,compiler)]
141-
for file_ in files:
142-
if os.path.isfile(file_):
143-
logger.warn("Removing file %s"%file_)
144-
os.remove(file_)
145-
if argcnt == 2:
146-
opts['clean_only'] = True
147-
148150
return opts
149151

150152
def _main():

0 commit comments

Comments
 (0)