]> sigrok.org Git - libsigrok.git/commitdiff
build: Set CXXFLAGS when building Python module
authorDaniel Elstner <redacted>
Mon, 2 Nov 2015 13:30:24 +0000 (14:30 +0100)
committerDaniel Elstner <redacted>
Mon, 2 Nov 2015 13:30:24 +0000 (14:30 +0100)
Set both CFLAGS and CXXFLAGS when executing setup.py to build
the Python bindings. Newer versions of distutils/setuptools have
apparently started to pick up the latter when compiling C++.

Makefile.am

index 10b2d03b94d39452118b8f17c0d4420cd1f6c2b8..660b0fc95e250de0bf050e6f5ba47ef96c263835 100644 (file)
@@ -590,7 +590,7 @@ PDIR = bindings/python
 PDOC_START = bindings/python/sigrok/core/doc_start.i
 PDOC_END = bindings/python/sigrok/core/doc_end.i
 
-setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' LDADD='$(PYSIGROK_LIBS)'
+setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' CXXFLAGS='$(AM_CXXFLAGS) $(CXXFLAGS)' LDADD='$(PYSIGROK_LIBS)'
 setup_quiet = --quiet
 setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet)