From 84ad3b71b4cced3ff061c60dd3a2d74bdaab27c9 Mon Sep 17 00:00:00 2001 From: gladman Date: Thu, 29 Mar 2012 11:44:35 +0000 Subject: [PATCH] correct bug introduceed in mpir_config.py --- build.vc10/mpir_config.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build.vc10/mpir_config.py b/build.vc10/mpir_config.py index 94ceba99..fc89041a 100644 --- a/build.vc10/mpir_config.py +++ b/build.vc10/mpir_config.py @@ -90,9 +90,6 @@ def copy_files(file_list, in_dir, out_dir): for f in file_list: copy(join(in_dir, f), out_dir) -def special_match(cf, af): - return cf.startswith('preinv_') and cf == 'preinv_' + af - # Recursively search a given directory tree to find header, # C and assembler code files that either replace or augment # the generic C source files in the input list 'src_list'. @@ -122,6 +119,8 @@ def find_asm(path, cf_list): for root, dirs, files in walk(path): if '.svn' in dirs: # ignore SVN directories dirs.remove('.svn') + if 'fat' in dirs: # ignore fat directory + dirs.remove('fat') relp = relpath(root, path) # path from asm root relr = relpath(root, mpir_dir) # path from MPIR root if relp == '.': # set C files as default @@ -147,7 +146,7 @@ def find_asm(path, cf_list): if x == '.asm': # if it is an assembler file match = False for cf in reversed(d[relp][1]): # remove any matching C file - if cf[0] == n or special_match(cf[0], n): + if cf[0] == n: d[relp][1].remove(cf) match = True break