diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2004-03-04 23:04:48 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2004-03-04 23:04:48 +0000 |
| commit | 1c5dfc8ed54322fb18a078879efb6f009757980f (patch) | |
| tree | b7f0e766196b683046df79ae8a0995ecb196c09a | |
| parent | fa4054de4e5f73ace598a555a194a3ffe35e923b (diff) | |
| download | numpy-1c5dfc8ed54322fb18a078879efb6f009757980f.tar.gz | |
Remove dummy cc_args from Fcompiler class so that include files get used for Fortan.
| -rw-r--r-- | scipy_distutils/absoftfcompiler.py | 2 | ||||
| -rw-r--r-- | scipy_distutils/ccompiler.py | 3 | ||||
| -rw-r--r-- | scipy_distutils/fcompiler.py | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/scipy_distutils/absoftfcompiler.py b/scipy_distutils/absoftfcompiler.py index 84dd00a16..5104ea077 100644 --- a/scipy_distutils/absoftfcompiler.py +++ b/scipy_distutils/absoftfcompiler.py @@ -23,7 +23,7 @@ class AbsoftFCompiler(FCompiler): 'compiler_f77' : ["f77"], 'compiler_fix' : ["f90"], 'compiler_f90' : ["f90"], - 'linker_so' : ["f77","-shared"], + 'linker_so' : ["f77","-dll"], 'archiver' : ["ar", "-cr"], 'ranlib' : ["ranlib"] } diff --git a/scipy_distutils/ccompiler.py b/scipy_distutils/ccompiler.py index 3fdc00922..0ef868930 100644 --- a/scipy_distutils/ccompiler.py +++ b/scipy_distutils/ccompiler.py @@ -20,8 +20,7 @@ def CCompiler_spawn(self, cmd, display=None): if type(display) is type([]): display = ' '.join(display) log.info(display) s,o = exec_command(cmd) - print s - print o + if os.name != 'posix': print s, o if s: if type(cmd) is type([]): cmd = ' '.join(cmd) diff --git a/scipy_distutils/fcompiler.py b/scipy_distutils/fcompiler.py index 6d85dab77..3ad723199 100644 --- a/scipy_distutils/fcompiler.py +++ b/scipy_distutils/fcompiler.py @@ -472,8 +472,8 @@ class FCompiler(CCompiler): def library_dir_option(self, dir): return "-L" + dir - def _get_cc_args(self, pp_opts, debug, extra_preargs): - return [] +# def _get_cc_args(self, pp_opts, debug, extra_preargs): +# return [] if sys.version[:3]<'2.3': def compile(self, sources, output_dir=None, macros=None, |