From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 2 Oct 2016 23:21:13 +0000 (+0200)
Subject: build: use CXXFLAGS if defined
X-Git-Tag: v17.01.0-rc1~1207
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=559fb537d83bc30fc2dfa783292b9f86712966d6

build: use CXXFLAGS if defined

Instead of using TARGET_CFLAGS and EXTRA_CFLAGS in cmake and scons
build use the TARGET_CXXFLAGS and EXTRA_CXXFLAGS like it is done for
normal make and configure. configure used TARGET_CXXFLAGS and
EXTRA_CFLAGS for the CXXFLAGS. The package-default.mk sets
"EXTRA_CXXFLAGS = $(EXTRA_CFLAGS)" so using EXTRA_CXXFLAGS flags should
be save.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/include/cmake.mk b/include/cmake.mk
index 483a151082..5f572e9d74 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -41,7 +41,7 @@ define Build/Configure/Default
 	mkdir -p $(CMAKE_BINARY_DIR)
 	(cd $(CMAKE_BINARY_DIR); \
 		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
 		cmake \
 			-DCMAKE_SYSTEM_NAME=Linux \
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index e371c3bdff..4eb5409909 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -97,7 +97,7 @@ CONFIGURE_ARGS = \
 CONFIGURE_VARS = \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
 		CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
 
diff --git a/include/scons.mk b/include/scons.mk
index a8306b658e..2b76710542 100644
--- a/include/scons.mk
+++ b/include/scons.mk
@@ -4,7 +4,7 @@ SCONS_VARS = \
 	CC="$(TARGET_CC_NOCACHE)" \
 	CXX="$(TARGET_CXX_NOCACHE)" \
 	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-	CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+	CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
 	CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
 	DESTDIR="$(PKG_INSTALL_DIR)"