aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Comstedt <marcus@mc.pp.se>2017-02-01 18:50:26 +0100
committerUwe Hermann <uwe@hermann-uwe.de>2017-02-02 11:04:44 +0100
commitb020b81b24bf6987cccffc3ea84049e66b9ccdb3 (patch)
tree165d43847667dcab74e46cbe95ab3f1e449d7f11
parent1d82f9ade3f1a38991b9be629ed1c1ef7eebac43 (diff)
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.
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 8114f66..48285dd 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)