summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-03-01 10:39:46 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-03-01 10:39:46 +0000
commitedc3ad9100856c582e55f6809df24167e0866535 (patch)
tree671e56d00e59a807fdf86e36bc372e520b0cb5cd
parenta8ec8ce1ac0116dfa7c37aa28cbd80578be1b397 (diff)
downloadmtk-20170518-edc3ad9100856c582e55f6809df24167e0866535.zip
mtk-20170518-edc3ad9100856c582e55f6809df24167e0866535.tar.gz
mtk-20170518-edc3ad9100856c582e55f6809df24167e0866535.tar.bz2
build: add TARGET_CXXFLAGS and EXTRA_CXXFLAGS, defaulting to *_CFLAGS via lazy evaluation. this allows adding c++ specific cflags
SVN-Revision: 30760
-rw-r--r--include/package-defaults.mk6
-rw-r--r--rules.mk1
2 files changed, 5 insertions, 2 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 491e401..3068d2b 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -55,6 +55,8 @@ ifneq ($(strip $(PKG_UNPACK)),)
endef
endif
+EXTRA_CXXFLAGS = $(EXTRA_CFLAGS)
+
CONFIGURE_PREFIX:=/usr
CONFIGURE_ARGS = \
--target=$(GNU_TARGET_NAME) \
@@ -79,7 +81,7 @@ CONFIGURE_ARGS = \
CONFIGURE_VARS = \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
- CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+ CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
@@ -104,7 +106,7 @@ endef
MAKE_VARS = \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
- CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+ CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"
MAKE_FLAGS = \
diff --git a/rules.mk b/rules.mk
index 45ef87c..a0ceca8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -108,6 +108,7 @@ BUILD_LOG_DIR:=$(TOPDIR)/logs
TARGET_PATH:=$(STAGING_DIR_HOST)/bin:$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH)))))
TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3)
+TARGET_CXXFLAGS = $(TARGET_CFLAGS)
TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),)