From: Daniel Elstner <redacted>
Date: Mon, 2 Nov 2015 13:30:24 +0000 (+0100)
Subject: build: Set CXXFLAGS when building Python module
X-Git-Tag: libsigrok-0.4.0~133
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=5dd538ded0d5873541af7cdf2e54c3e6d8297b49;hp=3d8691326666a32925aa555f3088185ccd5d846b;p=libsigrok.git

build: Set CXXFLAGS when building Python module

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++.
---

diff --git a/Makefile.am b/Makefile.am
index 10b2d03b..660b0fc9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)