From: Marcus Comstedt Date: Wed, 1 Feb 2017 17:50:26 +0000 (+0100) Subject: Build: fix #865 yet again X-Git-Tag: libsigrok-0.5.0~122 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b020b81b24bf6987cccffc3ea84049e66b9ccdb3;p=libsigrok.git Build: fix #865 yet again It appears that the symmetry changes of setting CC and CFLAGS correctly for C code compilation in commit 104f02f broke things for people using some other version of setuptools which uses those vars instead of CXX and CXXFLAGS when compiling C++ code. In order to make this work everywhere, set _both_ sets of variables as required for C++ compilation. No C code is compiled by the python binding module anyway. --- diff --git a/Makefile.am b/Makefile.am index 8114f660..48285ddc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -648,7 +648,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='$(CC)' CXX='$(CXX)' CFLAGS='$(CFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' CXXFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' LDADD='$(PYSIGROK_LIBS)' +setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CXX='$(CXX)' CFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' CXXFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' LDADD='$(PYSIGROK_LIBS)' setup_quiet = --quiet setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet)