diff options
| author | Patrick Simianer <p@simianer.de> | 2013-11-13 18:12:10 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-11-13 18:12:10 +0100 |
| commit | d6e6babf2cfe49fed040b651624b7e34d1a9b507 (patch) | |
| tree | 2a00ab18f10a7f93e7e172551c01b48cc9f20b8c /python/setup.py.in | |
| parent | 2d2d5eced93d58bc77894d8c328195cd9950b96d (diff) | |
| parent | 8a24bb77bc2e9fd17a6f6529a2942cde96a6af49 (diff) | |
merge w/ upstream
Diffstat (limited to 'python/setup.py.in')
| -rw-r--r-- | python/setup.py.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/python/setup.py.in b/python/setup.py.in index ce1eb2ed..a2aa28f6 100644 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -7,7 +7,7 @@ LIB = ['../decoder', '../utils', '../mteval', '../training/utils', '../klm/lm', # Set automatically by configure LIBS = re.findall('-l([^\s]+)', '@LIBS@') -CPPFLAGS = re.findall('-[^\s]+', '@CPPFLAGS@') +CPPFLAGS = re.findall('-[^\s]+', '@CPPFLAGS@ @CXXFLAGS@') LDFLAGS = re.findall('-[^\s]+', '@LDFLAGS@') # Make sure linker flags go only to the linker LDFLAGS = [opt.replace('-R', '-Wl,-rpath,') for opt in LDFLAGS] @@ -21,7 +21,8 @@ ext_modules = [ extra_compile_args=CPPFLAGS, extra_link_args=LDFLAGS), Extension(name='cdec.sa._sa', - sources=['cdec/sa/_sa.c', 'cdec/sa/strmap.cc']) + sources=['cdec/sa/_sa.cpp', 'cdec/sa/strmap.cc'], + extra_compile_args=CPPFLAGS) ] setup( |