From 559fb537d83bc30fc2dfa783292b9f86712966d6 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 3 Oct 2016 01:21:13 +0200 Subject: [PATCH] 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 --- include/cmake.mk | 2 +- include/package-defaults.mk | 2 +- include/scons.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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)" -- 2.25.1