Remove --old-and-unmanageable with distutils

pyodide_build/pywasmcross.py

@@ -175,7 +175,6 @@ def handle_command(line, args, dryrun=False):
     emcc test.c
     ['emcc', 'test.c']
     """
-
     # This is a special case to skip the compilation tests in numpy that aren't
     # actually part of the build
     for arg in line:
@@ -185,8 +184,6 @@ def handle_command(line, args, dryrun=False):
             return
         if arg == '-print-multiarch':
             return
-        if arg.startswith('/tmp'):
-            return
 
     if line[0] == 'gfortran':
         result = f2c(line)
@@ -210,8 +207,6 @@ def handle_command(line, args, dryrun=False):
     elif new_args[0] in ('emcc', 'em++'):
         new_args.extend(args.cflags.split())
 
-    lapack_dir = None
-
     # Go through and adjust arguments
     for arg in line[1:]:
         if arg.startswith('-I'):
@@ -233,15 +228,6 @@ def handle_command(line, args, dryrun=False):
         elif shared and arg.endswith('.so'):
             arg = arg[:-3] + '.wasm'
             output = arg
-        # Fix for scipy to link to the correct BLAS/LAPACK files
-        if arg.startswith('-L') and 'CLAPACK-WA' in arg:
-            lapack_dir = arg.replace('-L', '')
-            for lib_name in ['F2CLIBS/libf2c.bc',
-                             'blas_WA.bc',
-                             'lapack_WA.bc']:
-                arg = os.path.join(lapack_dir, f"{lib_name}")
-                new_args.append(arg)
-            continue
 
         new_args.append(arg)
 
@@ -303,9 +289,10 @@ def install_for_distribution(args):
     try:
         subprocess.check_call(commands)
     except Exception:
-        # XXX: temporary hack to remove --old-and-unmanageable with distutils
-        #      see https://github.com/iodide-project/pyodide/issues/220
-        #      for a better solution.
+        print(f'Warning: {" ".join(commands)} failed with distutils, possibly '
+              f'due to the use if distutils that does not support the '
+              f'--old-and-unmanageable argument. Re-trying the install '
+              f'without this argument.')
         subprocess.check_call(commands[:-1])