diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2011-08-20 11:13:08 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-08-20 11:13:08 -0600 |
| commit | ea529d4081a38acf85a759dda25e3edf0bd307dc (patch) | |
| tree | b42da1d4d06352757b30d7001b34d5b790f36563 /doc | |
| parent | cdf1ff1d2f92582d5aa150573a056462341d2dcf (diff) | |
| download | numpy-ea529d4081a38acf85a759dda25e3edf0bd307dc.tar.gz | |
BUG: Revert commit that causes many tests not to run.
Revert "Introduce new options extra_f77_compiler_args and extra_f90_compiler_args to Configuration.add_extension. Configuration.add_library, and Extension. These options allow specifying extra compile options for compiling Fortran sources within a setup.py file."
This reverts commit 43862759384a86cb4a95e8adb4d39fa1522acb28.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/DISTUTILS.rst.txt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/doc/DISTUTILS.rst.txt b/doc/DISTUTILS.rst.txt index a2ac0b986..b86274447 100644 --- a/doc/DISTUTILS.rst.txt +++ b/doc/DISTUTILS.rst.txt @@ -226,8 +226,7 @@ in writing setup scripts: ``define_macros``, ``undef_macros``, ``library_dirs``, ``libraries``, ``runtime_library_dirs``, ``extra_objects``, ``extra_compile_args``, ``extra_link_args``, ``export_symbols``, ``swig_opts``, ``depends``, - ``language``, ``f2py_options``, ``module_dirs``, ``extra_info``, - ``extra_f77_compile_args``, ``extra_compile_f90_args``. + ``language``, ``f2py_options``, ``module_dirs``, ``extra_info``. Note that ``config.paths`` method is applied to all lists that may contain paths. ``extra_info`` is a dictionary or a list @@ -262,12 +261,11 @@ in writing setup scripts: The second argument gives a path to a build directory that must be used when creating files to a disk. -+ ``config.add_library(name, sources, **build_info)`` --- add a - library to ``libraries`` list. Allowed keywords arguments are - ``depends``, ``macros``, ``include_dirs``, ``extra_compiler_args``, - ``f2py_options``, ``extra_f77_compile_args``, - ``extra_compile_f90_args``. See ``.add_extension()`` method for - more information on arguments. ++ ``config.add_library(name, sources, **build_info)`` --- add + a library to ``libraries`` list. Allowed keywords arguments + are ``depends``, ``macros``, ``include_dirs``, + ``extra_compiler_args``, ``f2py_options``. See ``.add_extension()`` + method for more information on arguments. + ``config.have_f77c()`` --- return True if Fortran 77 compiler is available (read: a simple Fortran 77 code compiled succesfully). |