diff options
| author | Pearu Peterson <pearu.peterson@gmail.com> | 2010-08-25 07:22:40 +0000 |
|---|---|---|
| committer | Pearu Peterson <pearu.peterson@gmail.com> | 2010-08-25 07:22:40 +0000 |
| commit | ff0822c48fb6cc1689a92038d579988c2db2f154 (patch) | |
| tree | e1fda3e28d53f0c93363e5e069b00e9b41671b88 /numpy/distutils/command/build_src.py | |
| parent | dbe18f0da8b4ec0c521dcef4dd1355742750c865 (diff) | |
| download | numpy-ff0822c48fb6cc1689a92038d579988c2db2f154.tar.gz | |
Make extension swig_opts effective to build_src command.
Diffstat (limited to 'numpy/distutils/command/build_src.py')
| -rw-r--r-- | numpy/distutils/command/build_src.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index c6aaf079a..c3acccb3b 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -640,7 +640,11 @@ class build_src(build_ext.build_ext): target_dirs = [] py_files = [] # swig generated .py files target_ext = '.c' - if self.swig_cpp: + if '-c++' in extension.swig_opts: + typ = 'c++' + is_cpp = True + extension.swig_opts.remove('-c++') + elif self.swig_cpp: typ = 'c++' is_cpp = True else: @@ -716,7 +720,7 @@ class build_src(build_ext.build_ext): self.mkpath(d) swig = self.swig or self.find_swig() - swig_cmd = [swig, "-python"] + swig_cmd = [swig, "-python"] + extension.swig_opts if is_cpp: swig_cmd.append('-c++') for d in extension.include_dirs: |