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 483a1510827b7496f53202ef615c71708c29de5c..5f572e9d7475e807ea56713ee2069dc98f5c1f6b 100644 (file)
--- 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 e371c3bdff286d90aa1ce8a9bc6b95d68512aea4..4eb54099098db02aded5b876b8c9ff95de1308af 100644 (file)
--- 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 a8306b658e2026485f080ce520468c23ccf0b38d..2b767105429e789bb0fd07ff37da9a0db74c02aa 100644 (file)
--- 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)"