From 104f02fda1f991654de3e87fb9f40c599fa26c80 Mon Sep 17 00:00:00 2001 From: "Vadim A. Misbakh-Soloviov" Date: Thu, 10 Nov 2016 16:56:43 +0700 Subject: [PATCH] Makefile: fix for #865. Buildsystem wants CXX to be defined as $(CXX). Otherwise it fallbacks to default value, which does not contain "-std=c++11" statement. Other changes (like CC=$(CC) and CFLAGS=$(CFLAGS) instead of CXX ones) is not directly fix the issue, but fix cases, where CFLAGS (and CC) differs from CXX* ones, so it could lead to similar errors in the future. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7d22a60f..82a3eb7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -647,7 +647,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='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' CXXFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' LDADD='$(PYSIGROK_LIBS)' +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_quiet = --quiet setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet)